Changeset 18681 for src/Pugs/Parser

Timestamp:

10/26/07 12:32:12 (13 months ago)

Author:

lwall

Message:

Cursor tweaks, new precedence for x and ~

Files:

• src/Pugs/Parser/Operator.hs (modified) (3 diffs)

src/Pugs/Parser/Operator.hs

@@ -48 +48 @@
     : multLevel                     -- Multiplicative
     : Map.foldWithKey foldInfix addiLevel (r_infix tights) -- Additive (user-definable)
+    : replLevel                     -- Replication
+    : concLevel                     -- Concatenation
     : junaLevel                     -- Junctive And
     : junoLevel                     -- Junctive Or
@@ -66 +68 @@
         -- _ -> error $ "Impossible: " ++ show op ++ " has no assoc?"
 
-termLevel, methLevel, incrLevel, expoLevel, symbLevel, multLevel, addiLevel, junaLevel, junoLevel :: [RuleOperator Exp]
+termLevel, methLevel, incrLevel, expoLevel, symbLevel, multLevel, addiLevel, replLevel, concLevel, junaLevel, junoLevel :: [RuleOperator Exp]
 termLevel = circumOps (Set.singleton (MkOpName (cast "\\( )")))
 methLevel = methOps (opWords " . .+ .? .* .+ .() .[] .{} .<<>> .= ")
@@ -72 +74 @@
 expoLevel = rightOps (opWords " ** ")
 symbLevel = preSyn (Set.singleton (MkOpName (cast "|"))) ++ preOps symbPreops
-multLevel = leftOps (opWords " * / % x xx +& +< +> ~& ~< ~> ?& ")
-addiLevel = leftOps (opWords " + - ~ +| +^ ~| ~^ ?| ")
+multLevel = leftOps (opWords " * / % +& +< +> ~& ~< ~> ?& ")
+addiLevel = leftOps (opWords " + - +| +^ ~| ~^ ?| ")
+replLevel = leftOps (opWords " x xx ")
+concLevel = leftOps (opWords " ~ ")
 junaLevel = listOps (opWords " & ")
 junoLevel = listOps (opWords " ^ | ")