Browse Source

parser: `=*`, `=+`, `=-`, `=/` removed

gretmn102 3 years ago
parent
commit
1d2f5dab9e
2 changed files with 3 additions and 5 deletions
  1. 2 4
      QSParse/Parsec.fs
  2. 1 1
      Test/Test.fs

+ 2 - 4
QSParse/Parsec.fs

@@ -46,11 +46,9 @@ let pAssign stmts =
 
         choice [
             str_ws "-=" >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Minus, Var name, defExpr))
-            str_ws "=-" >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Minus, defExpr, Var name))
             str_ws "/=" >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Divide, Var name, defExpr))
-            str_ws "=/" >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Divide, defExpr, Var name))
-            (str_ws "+=" <|> str_ws "=+") >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Plus, Var name, defExpr))
-            (str_ws "*=" <|> str_ws "=*") >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Times, Var name, defExpr))
+            str_ws "+=" >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Plus, Var name, defExpr))
+            str_ws "*=" >>. pexpr |>> fun defExpr -> Assign(ass, Expr.Expr(Times, Var name, defExpr))
             str_ws "=" >>. (asscode <|> (pexpr |>> fun defExpr -> Assign(ass, defExpr)))
         ]
 

+ 1 - 1
Test/Test.fs

@@ -211,7 +211,7 @@ let assignTest =
                     "  Error in Ln: 1 Col: 2"
                     "  f(expr) = 42"
                     "   ^"
-                    "  Expecting: '*=', '+=', '-=', '/=', '=', '=*', '=+', '=-', '=/', '[' or '_'"
+                    "  Expecting: '*=', '+=', '-=', '/=', '=', '[' or '_'"
                     ""
                 ] |> String.concat "\r\n"
             Assert.Equal("", Left exp, runExpr input)