diff --git a/M2/Macaulay2/d/binding.d b/M2/Macaulay2/d/binding.d index 2b708cd64e..18236a2b1a 100644 --- a/M2/Macaulay2/d/binding.d +++ b/M2/Macaulay2/d/binding.d @@ -285,12 +285,8 @@ bumpPrecedence(); export MinusS := makeKeyword(unarybinaryleft("-")); -- also binary export PlusS := makeKeyword(unarybinaryleft("+")); -- also binary export PlusPlusS := makeKeyword(binaryleft("++")); -bumpPrecedence(); - export InterpunctS := makeKeyword(binaryleft("·")); bumpPrecedence(); export StarStarS := makeKeyword(binaryleft("**")); - export BoxTimesS := makeKeyword(binaryleft("⊠")); - export ShuffleProductS := makeKeyword(binaryleft("⧢")); bumpPrecedence(); precBracket := prec; export leftbracket := parens("[","]",precBracket, precRightParen, precRightParen); @@ -515,10 +511,7 @@ export opsWithBinaryMethod := array(SymbolClosure)( PowerGreaterEqualS, UnderscoreGreaterEqualS, PowerLessS, UnderscoreLessS, PowerLessEqualS, UnderscoreLessEqualS, - PowerStarStarS, - InterpunctS, - BoxTimesS, - ShuffleProductS + PowerStarStarS ); export opsWithUnaryMethod := array(SymbolClosure)( StarS, MinusS, PlusS, LessLessS, QuestionQuestionS, diff --git a/M2/Macaulay2/tests/normal/symbols.m2 b/M2/Macaulay2/tests/normal/symbols.m2 index 3ecfde532b..446b243daf 100644 --- a/M2/Macaulay2/tests/normal/symbols.m2 +++ b/M2/Macaulay2/tests/normal/symbols.m2 @@ -2,4 +2,5 @@ assert (i -> symbol i === symbol i)() assert( (i -> symbol i)() =!= (i -> symbol i)() ) assert( symbolBody (i -> symbol i)() =!= symbolBody (i -> symbol i)() ) assert( f = i -> symbol i ; symbolBody f() === symbolBody f() ) - +assert( try getSymbol "" then false else true ) +assert( try getSymbol "++" then false else true ) diff --git a/M2/Macaulay2/tests/normal/unicode.m2 b/M2/Macaulay2/tests/normal/unicode.m2 index 0469edd662..ca7e076b5e 100644 --- a/M2/Macaulay2/tests/normal/unicode.m2 +++ b/M2/Macaulay2/tests/normal/unicode.m2 @@ -2,6 +2,7 @@ v = vector {1, 2} w = vector {3, 4} assert(v⊗w == vector {3, 4, 6, 8}) +makeKeyword("·") Vector·Vector := (v, w) -> ((transpose v#0) * w#0)_(0, 0) assert(v·w == 11)