change ppvaluepat

Author: kotapiku

hs-src/Language/Egison/ParserNonS.hs

@@ -357,8 +357,8 @@ pdMatchClause = try $ inSpaces (string "|") >> (,) <$> pdPattern <* (reservedOp
 
 ppPattern :: Parser PrimitivePatPattern
 ppPattern = P.lexeme lexer (ppWildCard
+                        <|> try ppValuePat
                         <|> ppPatVar
-                        <|> ppValuePat
                         <|> ppInductivePat
                         <?> "primitive-pattren-pattern")
 
@@ -369,7 +369,7 @@ ppPatVar :: Parser PrimitivePatPattern
 ppPatVar = reservedOp "$" *> pure PPPatVar
 
 ppValuePat :: Parser PrimitivePatPattern
-ppValuePat = reservedOp ",$" >> PPValuePat <$> ident
+ppValuePat = reservedOp "$" >> PPValuePat <$> ident
 
 ppInductivePat :: Parser PrimitivePatPattern
 ppInductivePat = angles (PPInductivePat <$> lowerName <*> sepEndBy ppPattern whiteSpace)
@@ -796,7 +796,6 @@ reservedKeywords =
 reservedOperators :: [String]
 reservedOperators =
   [ "$"
-  , ",$"
   , "_"
   , "^"
   , "&"

nons-test/test/syntax.egi

@@ -415,7 +415,7 @@ listDfs(a) = matcherDFS
                | $tgt -> matchAll tgt as listDfs(a)
                          | loop($i, (1, $n), <snoc $xa_i ...>, $rs) ->
                              (foldr((%i %r -> [@r, xa_i]), [], 1..n), rs)
-             | ,$val as () ->
+             | $val as () ->
                | $tgt -> if val == tgt then {()} else {}
              | $ as (something) ->
                | $tgt -> {tgt}