Mercurial > repos > tabletprog

changeset 262:9d93e65a34be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix whitespace problem in object grammar in new parser
author Michael Pavone <pavone@retrodev.com>
date Mon, 14 Jul 2014 09:29:49 -0700
parents 074f885596ed
children 98147071baf6
files modules/parser.tp
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/modules/parser.tp	Sun Jun 01 22:39:33 2014 -0700
+++ b/modules/parser.tp	Mon Jul 14 09:29:49 2014 -0700
@@ -19,7 +19,7 @@
 				(_posdata get: at) set: id val
 				self
 			}
-			
+
 			getMemo:at:else <- :id :at :else {
 				if: (_posdata length) > at {
 					(_posdata get: at) ifget: id :val {
@@ -86,12 +86,12 @@
 		base <- { _base }
 		start <- { _start }
 		memoData <- { _matchmemo }
-		
+
 		memo:at:withId <- :val :at :id {
 			_matchmemo memo: val at: (at + _start) withId: id length: (_base length)
 			self
 		}
-		
+
 		getMemo:at:else <- :id :at :else {
 			_matchmemo getMemo: id at: (at + _start) else: else
 		}
@@ -577,7 +577,7 @@
 			}))
 			withwhere addExpression: (quote: (tomatch memo: ret at: 0 withId: myid))
 			withwhere addExpression: (quote: ret)
-			
+
 			quote: :tomatch {
 				tomatch <- light: tomatch from: 0
 				tomatch getMemo: myid at: 0 else: withwhere
@@ -865,7 +865,7 @@
 		ast assign: Expr to: Symbol
 	}
 
-	object <- match: "#{" . ws . Messages . "}" where: {
+	object <- match: "#{" . ws . Messages . ws . "}" where: {
 		Messages <- zeroPlus: (match: ws . El where: {
 			El <- matchOne: [
 				assignment