- Add new tests

- Fix expected error messages (line numbers correct now)

diff --git a/re2c/test/cond_error_10.c.c b/re2c/test/cond_error_10.c.c
index 1cb5763dfeb985df8f523d00a95298a9b79e64f1..9ffacd65604211466d90ced431afd7c4ab06c5a6 100755 (executable)
--- a/re2c/test/cond_error_10.c.c
+++ b/re2c/test/cond_error_10.c.c
@@ -1 +1 @@
-re2c: error: line 8, column 1: Setup for non existing rule 'c' found
+re2c: error: line 6, column 1: Setup for non existing rule 'c' found

diff --git a/re2c/test/cond_error_11.c.c b/re2c/test/cond_error_11.c.c
index 45a51bb786209f1f08c221cc580ac966c203af68..5909407d063f22b35ab6c0cbb6ab478cfefb7379 100755 (executable)
--- a/re2c/test/cond_error_11.c.c
+++ b/re2c/test/cond_error_11.c.c
@@ -1 +1 @@
-re2c: error: line 9, column 1: Setup for all rules with '*' not possible when all rules are setup explicitly
+re2c: error: line 7, column 1: Setup for all rules with '*' not possible when all rules are setup explicitly

diff --git a/re2c/test/error13.1.c b/re2c/test/error13.1.c
index ad7e15cd77b7870179d4e26218d2eeda2366ce60..e44533a102b884a69abd39a03b9b48298a1f1100 100755 (executable)
--- a/re2c/test/error13.1.c
+++ b/re2c/test/error13.1.c
@@ -2,4 +2,4 @@
 #line 1 "error13.1.re"
 #define YYMAXFILL 1
 
-re2c: error: line 0, column 1: found scanner block after YYMAXFILL declaration
+re2c: error: line 3, column 1: found scanner block after YYMAXFILL declaration

diff --git a/re2c/test/error14.1.c b/re2c/test/error14.1.c
index 789c4d9c2f9cd03fa6f26e8392137199db252258..23bdd383a06fb605e9472cdb267ea74ae84c639d 100755 (executable)
--- a/re2c/test/error14.1.c
+++ b/re2c/test/error14.1.c
@@ -50,4 +50,4 @@ yy9:
 
 #define YYMAXFILL 3
 
-re2c: error: line 5, column 1: cannot generate YYMAXFILL twice
+re2c: error: line 9, column 1: cannot generate YYMAXFILL twice

diff --git a/re2c/test/error14.c b/re2c/test/error14.c
index 7235d52329496cb0e82c854b324315e3ad9dd5c1..3583e1d632f2233ee5d79037e91013b9d519a3db 100755 (executable)
--- a/re2c/test/error14.c
+++ b/re2c/test/error14.c
@@ -1 +1 @@
-re2c: error: line 5, column 1: cannot generate YYMAXFILL twice
+re2c: error: line 9, column 1: cannot generate YYMAXFILL twice

diff --git a/re2c/test/repeat-00.cgi.c b/re2c/test/repeat-00.cgi.c
index 2e3edb76006765f923edfb2e43d0f4a6e4bdf83f..63a649cbd27f80519ea5b90387a8099585b40043 100755 (executable)
--- a/re2c/test/repeat-00.cgi.c
+++ b/re2c/test/repeat-00.cgi.c
@@ -1 +1 @@
-re2c: error: line 17, column 1: Cannot reuse scanner definition without -r flag
+re2c: error: line 22, column 1: Cannot reuse scanner definition without -r flag

diff --git a/re2c/test/repeat-03.cgir.c b/re2c/test/repeat-03.cgir.c
new file mode 100755 (executable)
index 0000000..8fa88c2
--- /dev/null
+++ b/re2c/test/repeat-03.cgir.c
@@ -0,0 +1 @@
+re2c: error: line 21, column 10: Rules not allowed in 'repeat:re2c' block

diff --git a/re2c/test/repeat-03.cgir.re b/re2c/test/repeat-03.cgir.re
new file mode 100755 (executable)
index 0000000..80416eb
--- /dev/null
+++ b/re2c/test/repeat-03.cgir.re
@@ -0,0 +1,24 @@
+// multiple scanners, error
+
+/*!types:re2c */
+
+void scan(unsigned char* in)
+{
+/*!re2c
+
+<*>            "1"     { return "1"; }
+<*>            "2"     { return "2"; }
+<r1>   "a" { return "a"; }
+<r1,r2>        "b" { return "b"; }
+
+*/
+}
+
+void scan(unsigned short* in)
+{
+/*!repeat:re2c
+
+<r1>   "c" { return "c"; }
+
+*/
+}

diff --git a/re2c/test/repeat-04.cgir.c b/re2c/test/repeat-04.cgir.c
new file mode 100755 (executable)
index 0000000..56460c0
--- /dev/null
+++ b/re2c/test/repeat-04.cgir.c
@@ -0,0 +1 @@
+re2c: error: line 20, column 1: Cannot have another 're2c' block after a block containing rules

diff --git a/re2c/test/repeat-04.cgir.re b/re2c/test/repeat-04.cgir.re
new file mode 100755 (executable)
index 0000000..3d53c4d
--- /dev/null
+++ b/re2c/test/repeat-04.cgir.re
@@ -0,0 +1,23 @@
+// multiple scanners, error
+
+/*!types:re2c */
+
+void scan(unsigned char* in)
+{
+/*!re2c
+re2c:define:YYCTYPE  = 'unsigned char';
+*/
+
+/*!re2c
+
+<*>            "1"     { return "1"; }
+<*>            "2"     { return "2"; }
+<r1>   "a" { return "a"; }
+<r1,r2>        "b" { return "b"; }
+
+*/
+/* Next block is not possible */
+/*!re2c
+*/
+}
+ 
\ No newline at end of file