Dict literal now accepts expressions as keys. Key values are computed at evalutetion time and still must be integer or string

scan/ast.go

@@ -98,7 +98,7 @@ func (ast *Ast) insert(tree, node *Term) (root *Term, err error) {
 		root = node
 		tree.SetParent(node)
 	} else {
-		err = node.Errorf("two adjacent operators: %q and %q", tree, node)
+		err = node.Errorf("two adjacent operators: %q and %q", tree, node.Source())
 	}
 	return
 }

scan/symbol-map.go

@@ -188,25 +188,6 @@ func StringEndsWithOperator(s string) bool {
 	return endingOperator(s) != SymNone
 }
 
-// func endingOperator(s string) (sym Symbol) {
-// 	var matchLength = 0
-// 	sym = SymNone
-// 	lower := strings.TrimRight(strings.ToLower(s), " \t")
-// 	for symbol, spec := range symbolMap {
-// 		if strings.HasSuffix(lower, spec.repr) {
-// 			if len(spec.repr) > matchLength {
-// 				matchLength = len(spec.repr)
-// 				if spec.kind == symClassOperator && (spec.opType == PosInfix || spec.opType == PosPrefix) {
-// 					sym = symbol
-// 				} else {
-// 					sym = SymNone
-// 				}
-// 			}
-// 		}
-// 	}
-// 	return
-// }
-
 func endingOperator(s string) (sym Symbol) {
 	var matchLength = 0
 	var repr string

scan/token.go

@@ -136,3 +136,7 @@ func (tk *Token) ErrorExpectedGotStringWithPrefix(prefix, symbol, got string) (e
 	err = fmt.Errorf("[%d:%d] %s %s, got `%s`", tk.row, tk.col, prefix, symbol, got)
 	return
 }
+
+func (tk *Token) ErrorExpectedOneOfGot(expected ...Symbol) (err error) {
+	return tk.ErrorExpectedGotStringWithPrefix("expected one of ", SymListToString(expected, true), SymToString(tk.Sym))
+}