Fix "use parser many times" and heredoc

btwael · Aug 25, 2014 · 81cd35c · 81cd35c
1 parent 2c882e2
commit 81cd35c
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 17 deletions.
diff --git a/extras/mammouth.js b/extras/mammouth.js
@@ -890,7 +890,7 @@ require["./context"] = (function() {var exports = {}, module = {exports: exports
   		[x] Fileinfo
   		[x] Filesystem
   		[x] Inotify
-  		[ ] Mimetype
+  		[x] Mimetype
   		[ ] Proctitle
   		[ ] xattr
   		[ ] xdiff
@@ -2579,13 +2579,31 @@ require["./lexer"] = (function() {var exports = {}, module = {exports: exports};
     IDENTIFIER: /(([$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)( [^\n\S]* : (?!:) )?)/,
     NUMBER: /(0b[01]+|0o[0-7]+|0(x|X)[\da-fA-F]+|\d*\.?\d+(?:(e|E)[+-]?\d+)?)/,
     STRING: /('[^\\']*(?:\\[\s\S][^\\']*)*'|"[^\\"]*(?:\\[\s\S][^\\"]*)*")/,
-    HEREDOC: /(((?!(\`))(.|[\n\r\u2028\u2029]|[\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000]))*)/,
+    HEREDOC: /(((?!(\`|{{|}}))([\n\r\u2028\u2029]|.))*)/,
     LineTerminator: /[\n\r\u2028\u2029]/,
     Zs: /[\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000]/,
     SingleComment: /#(.*)+[\n\r\u2028\u2029]/,
     MultiComment: /###(([\n\r\u2028\u2029]|.)*)###/
   };
 
+  lexer.addRule(/^/, function(lexeme) {
+    IntoArray = false;
+    IntoMammouth = false;
+    IntoHereDoc = false;
+    Levels = [
+      {
+        IndentStack: [],
+        CurrentIndent: -1,
+        OpenedIndent: 0
+      }
+    ];
+    OpenedParens = [];
+    lastIsIdentifier = false;
+    captureTypeCasting = false;
+    tokenStack = [];
+    return this.reject = true;
+  });
+
   lexer.addRule(RegularExpression.PlainText, function(lexeme) {
     if (!IntoMammouth) {
       col += lexeme.length;
@@ -2667,6 +2685,7 @@ require["./lexer"] = (function() {var exports = {}, module = {exports: exports};
         OpenedIndent: 0
       }
     ];
+    OpenedParens = [];
     lastIsIdentifier = false;
     ShouldCloseCall = false;
     captureTypeCasting = false;

diff --git a/extras/mammouth.min.js b/extras/mammouth.min.js
diff --git a/lib/context.js b/lib/context.js
diff --git a/lib/lexer.js b/lib/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -18,7 +18,7 @@ Levels = [
 OpenedParens = []
 
 lastIsIdentifier = false
-captureTypeCasting  =false
+captureTypeCasting  = false
 tokenStack = []
 
 setToken = (token) ->
@@ -71,9 +71,11 @@ RegularExpression =
 			(
 				?!(
 					\`
+					|{{
+					|}}
 				)
 			)
-			(.|[\n\r\u2028\u2029]|[\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000])
+			([\n\r\u2028\u2029]|.)
 		)*
 	) ///
 
@@ -83,6 +85,27 @@ RegularExpression =
 	SingleComment: /#(.*)+[\n\r\u2028\u2029]/
 	MultiComment: /###(([\n\r\u2028\u2029]|.)*)###/
 
+# End of string
+lexer.addRule /^/, (lexeme) ->
+	IntoArray = false
+	IntoMammouth = false
+	IntoHereDoc = false
+
+	Levels = [
+		{
+			IndentStack: []
+			CurrentIndent: -1
+			OpenedIndent: 0
+		}
+	]
+
+	OpenedParens = []
+
+	lastIsIdentifier = false
+	captureTypeCasting  = false
+	tokenStack = []
+	@reject = true
+
 # check for plain text
 lexer.addRule RegularExpression.PlainText, (lexeme) ->
 	if not IntoMammouth
@@ -159,6 +182,8 @@ lexer.addRule RegularExpression.MammouthStart, ->
 		}
 	]
 
+	OpenedParens = []
+
 	lastIsIdentifier = false
 	ShouldCloseCall = false
 	captureTypeCasting  =false

diff --git a/test.js b/test.js
@@ -4,15 +4,12 @@ function heredoc (f) {
 v = heredoc(function() {
 /*
 {{
-switch day
- when "Mon"
-  go(work)
- when "Tue"
-  go(relax)
- when "Thu"
-  go(iceFishing)
- else
-  walloooo()
+`sdfsdfsdfdsfsdsdfssdfssf
+dsfsdfs
+dd
+
+
+fsdfsdfsd`
 }}
 */
 })