Changeset 4955

Timestamp:

06/26/05 09:11:31 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

6771

Message:

* minor source cleanups.

Location:

src/Pugs

Files:

• Compile.hs (modified) (1 diff)
• Rule/Expr.hs (modified) (1 diff)

src/Pugs/Compile.hs

@@ -31 +31 @@
     PNoop       :: PIL Stmt
 
+    PPos        :: !Pos -> !Exp -> !(PIL a) -> PIL a
     PRawName    :: !VarName -> PIL Expression -- XXX HACK!
+
+    PVal        :: !Val -> PIL Literal
+    PVar        :: !VarName -> PIL LValue
 
     PExp        :: !(PIL LValue) -> PIL Expression 
     PLit        :: !(PIL Literal) -> PIL Expression
-    PPos        :: !Pos -> !Exp -> !(PIL a) -> PIL a
-    PStmt       :: !(PIL Expression) -> PIL Stmt 
     PThunk      :: !(PIL Expression) -> PIL Expression 
     PCode       :: !SubType -> ![TParam] -> !(PIL [Stmt]) -> PIL Expression 
 
-    PVal        :: !Val -> PIL Literal
-    PVar        :: !VarName -> PIL LValue
-
+    PStmt       :: !(PIL Expression) -> PIL Stmt 
     PStmts      :: !(PIL Stmt) -> !(PIL [Stmt]) -> PIL [Stmt]
+
     PApp        :: !TCxt -> !(PIL Expression) -> ![PIL Expression] -> PIL LValue
     PAssign     :: ![PIL LValue] -> !(PIL Expression) -> PIL LValue
     PBind       :: ![PIL LValue] -> !(PIL Expression) -> PIL LValue
+
     PPad        :: !Scope -> ![(VarName, PIL Expression)] -> !(PIL [Stmt]) -> PIL [Stmt]
-
     PSub        :: !SubName -> !SubType -> ![TParam] -> !(PIL [Stmt]) -> PIL Decl
 #endif

src/Pugs/Rule/Expr.hs

@@ -33 +33 @@
 
 data Operator t st a      = Infix (GenParser t st (a -> a -> a)) Assoc
-                          | InfixList (GenParser t st ([a] -> a)) Assoc
                           | Prefix (GenParser t st (a -> a))
                           | Postfix (GenParser t st (a -> a))
+                          | InfixList (GenParser t st ([a] -> a)) Assoc
                           | OptionalPrefix (GenParser t st (a -> a))