repos/tabletprog: modules/parser.tp comparison

Improve compatibility of new parser with the old one

author	Mike Pavone <pavone@retrodev.com>
date	Mon, 06 Jan 2014 00:48:19 -0800
parents	5b830147c1cd
children	3590ecca6bc9

comparison

equal deleted inserted replaced

-:5b830147c1cd
+:ae5188be523e
 		litbits <- 32
 		if: (Suffix length) > 0 {
 			if: (Suffix from: 0 withLength: 1) = "u" {
 				signed <- false
 			}
-			print: (Suffix from: 1) . "\n"
 			litbits <- (Suffix from: 1) int32
 		}
 		#{
 			litval <- num
 			signed? <- signed
 		}
 	]
 	funcall <- match: hws . Initial . Parts where: {
 		Initial <- match: namepart
-		Parts <- onePlus: argpart
+		Parts <- zeroPlus: argpart
 	} yield: {
+		if: (Parts length) = 0 {
+			Parts <- []
+		}
 		Initial | Parts foldr: #{
 			name <- ""
 			args <- []
 		} with: :acc el {
 			nextName <- acc name
 		]
 	} yield: {
 		Expr
 	}
+	opsym <- match: Name where: {
+		Name <- matchOne: ["&&" "||" "<=" ">=" "<" ">" "=" "!=" "=" "-" "." "*" "/" "%" "|"]
+	} yield: {
+		#{
+			name <- Name
+			string <- {
+				name
+			}
+		}
+	}
 	assignment <- match: ws . Symbol . hws . "<-" . Expr where: {
-		Symbol <- match: symexpr
+		Symbol <- matchOne: [
+			symexpr
+			opsym
+		]
 		Expr <- match: expr
 	} yield: {
 		#{
 			assign <- Expr
 			to <- Symbol
 			}
 		}
 	}
 	object <- match: "#{" . ws . Messages . "}" where: {
-		Messages <- zeroPlus: assignment
+		Messages <- zeroPlus: (match: ws . El where: {
-	} yield: {
+			El <- matchOne: [
+				assignment
+				funcall
+			]
+		} yield: { El })
+	} yield: {
+		if: (Messages length) = 0 {
+			Messages <- []
+		}
 		#{
 			messages <- Messages
 			string <- {
 				"#{\n\t". ((messages map: :el {
 					string: el

Mercurial > repos > tabletprog