Nitcc occasional tokens

contrib/nitcc/src/grammar.nit

@@ -663,6 +663,9 @@ class Token
 	do
 		return to_s
 	end
+
+	# Unexpected occurences of this token do not cause a syntax error but are ignored.
+	var occasional = false is writable
 end
 
 # A alternative with a cursor (dot) before an element

contrib/nitcc/src/lrautomaton.nit

@@ -365,17 +365,17 @@ redef class Generator
 		end
 
 		add "redef class NToken"
+		add "\t# Default action on any state"
+		add "\tprivate fun action_default(parser: Parser) do"
+		add "\t\tparser.parse_error"
+		add "\tend"
+
 		for s in states do
 			if not s.need_guard then continue
 			add "\t# guarded action for state {s}"
 			add "\t# {s.shifts.length} shift(s) and {s.reduces.length} reduce(s)"
 			add "\tprivate fun action_s{s.number}(parser: Parser) do"
-			if s.reduces.length != 1 then
-				add "\t\tparser.parse_error"
-			else
-				add "\t\treduce_{s.reduces.first.cname}(parser)"
-				#gen_reduce_to_nit(s.reduces.first)
-			end
+			add "\t\taction_default(parser)"
 			add "\tend"
 		end
 		add "end"
@@ -390,12 +390,16 @@ redef class Generator
 			end
 			for s in t.reduces do
 				if not s.need_guard then continue
-				if s.reduces.length <= 1 then continue
 				add "\tredef fun action_s{s.number}(parser) do"
 				add "\t\treduce_{s.guarded_reduce[t].first.alt.cname}(parser)"
 				#gen_reduce_to_nit(s.guarded_reduce[t].first.alt)
 				add "\tend"
 			end
+			if t.occasional then
+				add "\tredef fun action_default(parser) do"
+				add "\t\tparser.get_token"
+				add "\tend"
+			end
 			add "end"
 		end
 

contrib/nitcc/src/nitcc.sablecc

@@ -80,10 +80,10 @@ text {-> re} =
 	{ch_dec:} ch_dec |
 	{ch_hex:} ch_hex ;
 
-parser_part = 'Parser' ign? rej? prod*;
+parser_part = 'Parser' ign? occasional? rej? prod*;
 
 ign = 'Ignored' elem_list ';' ;
-
+occasional = 'Occasional' elem_list ';' ;
 rej = 'Rejected' elem_list ';' ;
 
 prod = id ptrans? '=' alts priority* ';';

contrib/nitcc/src/nitcc_semantic.nit

@@ -116,6 +116,9 @@ private class CheckNameVisitor
 	# Known ignored tokens
 	var ignoreds = new Array[Element]
 
+	# Known occasional tokens
+	var occasionals = new Array[Element]
+
 	# Known rejected tokens
 	var rejecteds = new Array[Element]
 
@@ -244,6 +247,25 @@ redef class Nign
 	end
 end
 
+redef class Noccasional
+	redef fun accept_check_name_visitor(v) do
+		# Add elements to the ignored list
+		v.elems = v.occasionals
+		super
+		for e in v.elems do
+			if e isa Production then
+				print "Error: cannot ignore {e}, it is a production"
+				exit(1)
+				abort
+			else if e isa Token then
+				e.occasional = true
+			else
+				abort
+			end
+		end
+	end
+end
+
 redef class Nrej
 	redef fun accept_check_name_visitor(v) do
 		# Add elements to the rejected list

contrib/nitcc/tests/occasional.input

@@ -0,0 +1 @@
+abbabbaa

contrib/nitcc/tests/occasional.sablecc

@@ -0,0 +1,5 @@
+Parser
+Ignored #10, #32;
+Occasional 'b';
+s = s e | e;
+e = 'a' 'a' | 'b' ;

contrib/nitcc/tests/occasional2.input

@@ -0,0 +1 @@
+abbabbaa

contrib/nitcc/tests/occasional2.sablecc

@@ -0,0 +1,6 @@
+Parser
+Ignored #10, #32;
+Occasional 'b';
+s = s e | e;
+e = 'a' 'a' | b ;
+b = 'b' ;

contrib/nitcc/tests/oneliner3.input

@@ -0,0 +1,27 @@
+
+
+if id then id
+
+if id then
+  id
+  if id then id
+  id
+end
+
+if
+  id
+then
+  id
+  if id then id
+  id
+end
+
+if id then if id then id
+
+if id then if id then
+  id
+  if id then id
+  id
+end
+
+

contrib/nitcc/tests/oneliner3.sablecc

@@ -0,0 +1,21 @@
+Grammar oneliner;
+Lexer
+n	= #10;
+Parser
+Ignored #32;
+Occasional n;
+
+prog
+	= stmts
+	;
+expr	= 'if' expr 'then' expr
+	| 'if' expr 'then' eol stmts 'end'
+	| 'id'
+	;
+
+stmts
+	= stmts expr eol
+	| expr eol
+	;
+
+eol	= n | ';';

contrib/nitcc/tests/oneliner4.input

@@ -0,0 +1,27 @@
+
+
+if id then id
+
+if id then
+  id
+  if id then id
+  id
+end
+
+if
+  id
+then
+  id
+  if id then id
+  id
+end
+
+if id then if id then id
+
+if id then if id then
+  id
+  if id then id
+  id
+end
+
+

contrib/nitcc/tests/oneliner4.sablecc

@@ -0,0 +1,21 @@
+Grammar oneliner;
+Lexer
+n	= #10;
+Parser
+Ignored #32;
+Occasional n;
+
+prog
+	= stmts eol?
+	;
+expr	= 'if' expr 'then' expr
+	| 'if' expr 'then' eol stmts eol 'end'
+	| 'id'
+	;
+
+stmts
+	= stmts eol expr
+	| expr
+	;
+
+eol	= n | ';';

contrib/nitcc/tests/sav/conflict-dangling.1alt1.alt1.input3.res

@@ -1,12 +1,10 @@
 NParserError@(1:5-1:6)='3'
 Nodes[Node]
-  f_0
-    e_1
-      '1'@(1:1-1:2)
-      e_2
-        '1'@(1:2-1:3)
-        e_0
-          '0'@(1:3-1:4)
-        x
-          '2'@(1:4-1:5)
+  '1'@(1:1-1:2)
+  e_2
+    '1'@(1:2-1:3)
+    e_0
+      '0'@(1:3-1:4)
+    x
+      '2'@(1:4-1:5)
   '3'@(1:5-1:6)

contrib/nitcc/tests/sav/conflict-dangling.1alt1.alt2.input3.res

@@ -1,14 +1,11 @@
 NParserError@(1:5-1:6)='3'
 Nodes[Node]
-  f_0
-    e_1
-      '1'@(1:1-1:2)
-      e_1
-        '1'@(1:2-1:3)
-        e_0
-          '0'@(1:3-1:4)
-        y_0
-          x
-            '2'@(1:4-1:5)
-      y_1
+  '1'@(1:1-1:2)
+  e_1
+    '1'@(1:2-1:3)
+    e_0
+      '0'@(1:3-1:4)
+    y_0
+      x
+        '2'@(1:4-1:5)
   '3'@(1:5-1:6)

contrib/nitcc/tests/sav/conflict-dangling.1alt1.input3.res

@@ -1,11 +1,9 @@
 NParserError@(1:5-1:6)='3'
 Nodes[Node]
-  f_0
-    e_1
-      '1'@(1:1-1:2)
-      e_2
-        '1'@(1:2-1:3)
-        e_0
-          '0'@(1:3-1:4)
-        '2'@(1:4-1:5)
+  '1'@(1:1-1:2)
+  e_2
+    '1'@(1:2-1:3)
+    e_0
+      '0'@(1:3-1:4)
+    '2'@(1:4-1:5)
   '3'@(1:5-1:6)

contrib/nitcc/tests/sav/conflict-dangling.alt1.input3.res

@@ -1,12 +1,10 @@
 NLexerError@(1:5-1:5)='3'
 Nodes[Node]
-  f
-    e_1
-      '1'@(1:1-1:2)
-      e_2
-        '1'@(1:2-1:3)
-        e_0
-          '0'@(1:3-1:4)
-        x
-          '2'@(1:4-1:5)
+  '1'@(1:1-1:2)
+  e_2
+    '1'@(1:2-1:3)
+    e_0
+      '0'@(1:3-1:4)
+    x
+      '2'@(1:4-1:5)
   NLexerError@(1:5-1:5)='3'

contrib/nitcc/tests/sav/conflict-dangling.alt2.input3.res

@@ -1,14 +1,11 @@
 NLexerError@(1:5-1:5)='3'
 Nodes[Node]
-  f
-    e_1
-      '1'@(1:1-1:2)
-      e_1
-        '1'@(1:2-1:3)
-        e_0
-          '0'@(1:3-1:4)
-        y_0
-          x
-            '2'@(1:4-1:5)
-      y_1
+  '1'@(1:1-1:2)
+  e_1
+    '1'@(1:2-1:3)
+    e_0
+      '0'@(1:3-1:4)
+    y_0
+      x
+        '2'@(1:4-1:5)
   NLexerError@(1:5-1:5)='3'

contrib/nitcc/tests/sav/conflict-dangling.input3.res

@@ -1,11 +1,9 @@
 NLexerError@(1:5-1:5)='3'
 Nodes[Node]
-  f
-    e_1
-      '1'@(1:1-1:2)
-      e_2
-        '1'@(1:2-1:3)
-        e_0
-          '0'@(1:3-1:4)
-        '2'@(1:4-1:5)
+  '1'@(1:1-1:2)
+  e_2
+    '1'@(1:2-1:3)
+    e_0
+      '0'@(1:3-1:4)
+    '2'@(1:4-1:5)
   NLexerError@(1:5-1:5)='3'

contrib/nitcc/tests/sav/inf5000-04-lexer-demo.input2.res

@@ -1,4 +1,3 @@
 NLexerError@(1:1-1:1)='5'
 Nodes[Node]
-  p
   NLexerError@(1:1-1:1)='5'

contrib/nitcc/tests/sav/inf5000-05-grammaire-arithmetique.alt1.res

@@ -1 +1 @@
-16:1-16:11 Syntax Error: Unexpected unknown_keyword 'Precedence'; is acceptable instead: Eof
+16:1-16:11 Syntax Error: Unexpected unknown_keyword 'Precedence'; is acceptable instead: prod

contrib/nitcc/tests/sav/inf5000-06-grammaire2-calculatrice.res

@@ -1 +1 @@
-15:7-15:17 Syntax Error: Unexpected unknown_keyword 'Precedence'; is acceptable instead: Eof
+15:7-15:17 Syntax Error: Unexpected unknown_keyword 'Precedence'; is acceptable instead: prod

contrib/nitcc/tests/sav/inf5000-06-grammaire2-grammaire.input.res

@@ -92,19 +92,17 @@ Nodes[Node]
       ';'@(4:27-4:28)
   id@(5:1-5:6)='atoms'
   '='@(5:7-5:8)
-  alts_many
-    alts_one
-      alt_0
-        altid@(5:9-5:16)='{many:}'
+  alts_one
+    alt_0
+      altid@(5:9-5:16)='{many:}'
+      atoms_many
         atoms_many
-          atoms_many
-            atoms_none
-            atom_id
-              id@(5:17-5:22)='atoms'
+          atoms_none
           atom_id
-            id@(5:23-5:27)='atom'
-    '|'@(5:28-5:29)
-    alt_0
-      altid@(5:30-5:37)='{none:}'
-      atoms_none
+            id@(5:17-5:22)='atoms'
+        atom_id
+          id@(5:23-5:27)='atom'
+  '|'@(5:28-5:29)
+  altid@(5:30-5:37)='{none:}'
+  atoms_none
   NLexerError@(5:38-5:38)='E'

contrib/nitcc/tests/sav/inf5000-06-grammaire2-grammaire2.res

@@ -1 +1 @@
-11:20-11:29 Syntax Error: Unexpected unknown_keyword 'Separator'; is acceptable instead: elem, text
+11:20-11:29 Syntax Error: Unexpected unknown_keyword 'Separator'; is acceptable instead: '*', '?', '+'

contrib/nitcc/tests/sav/inf5000-06-grammaire2-instructions.alt3.res

@@ -1 +1 @@
-20:14-20:23 Syntax Error: Unexpected unknown_keyword 'Separator'; is acceptable instead: elem, text
+20:14-20:23 Syntax Error: Unexpected unknown_keyword 'Separator'; is acceptable instead: '*', '?', '+'

contrib/nitcc/tests/sav/inf5000-06-grammaire2-polygone.res

@@ -1 +1 @@
-8:25-8:34 Syntax Error: Unexpected unknown_keyword 'Separator'; is acceptable instead: elem, text
+8:25-8:34 Syntax Error: Unexpected unknown_keyword 'Separator'; is acceptable instead: '*', '?', '+'

contrib/nitcc/tests/sav/lexer-c-comment.alt3.res

@@ -1 +1 @@
-11:26-11:35 Syntax Error: Unexpected unknown_keyword 'Lookahead'; is acceptable instead: ')', '|'
+11:26-11:35 Syntax Error: Unexpected unknown_keyword 'Lookahead'; is acceptable instead: '.'

contrib/nitcc/tests/sav/lexer-errors.alt7.res

@@ -1 +1 @@
-10:16-10:25 Syntax Error: Unexpected unknown_keyword 'Lookahead'; is acceptable instead: ';', '|'
+10:16-10:25 Syntax Error: Unexpected unknown_keyword 'Lookahead'; is acceptable instead: '.'

contrib/nitcc/tests/sav/lexer-implicit-longest-and-priority.alt1.res

@@ -1 +1 @@
-4:9-4:18 Syntax Error: Unexpected unknown_keyword 'Lookahead'; is acceptable instead: ';', '|'
+4:9-4:18 Syntax Error: Unexpected unknown_keyword 'Lookahead'; is acceptable instead: '.'