Introduce red-green syntax tree

15 files changed, 54 insertions, 51 deletions

diff --git a/tests/data/parser/err/0000_struct_field_missing_comma.txt b/tests/data/parser/err/0000_struct_field_missing_comma.txt
index 5196fd718..2bb3ee6ec 100644
--- a/tests/data/parser/err/0000_struct_field_missing_comma.txt
+++ b/tests/data/parser/err/0000_struct_field_missing_comma.txt
@@ -18,7 +18,7 @@ FILE@[0; 34)
               WHITESPACE@[17; 18)
               IDENT@[18; 21) "u32"
               WHITESPACE@[21; 26)
-    err: `expected COMMA`
+              err: `expected COMMA`
     NAMED_FIELD@[26; 33)
       NAME@[26; 27)
         IDENT@[26; 27) "b"
diff --git a/tests/data/parser/err/0001_item_recovery_in_file.txt b/tests/data/parser/err/0001_item_recovery_in_file.txt
index e41ddc009..01bd2abe6 100644
--- a/tests/data/parser/err/0001_item_recovery_in_file.txt
+++ b/tests/data/parser/err/0001_item_recovery_in_file.txt
@@ -1,10 +1,10 @@
 FILE@[0; 21)
+err: `expected item`
   ERROR@[0; 3)
-  err: `expected item`
     IF_KW@[0; 2)
     WHITESPACE@[2; 3)
+    err: `expected item`
   ERROR@[3; 10)
-  err: `expected item`
     MATCH_KW@[3; 8)
     WHITESPACE@[8; 10)
   STRUCT_ITEM@[10; 21)
diff --git a/tests/data/parser/err/0002_duplicate_shebang.txt b/tests/data/parser/err/0002_duplicate_shebang.txt
index e7cf7187d..1a4b37da8 100644
--- a/tests/data/parser/err/0002_duplicate_shebang.txt
+++ b/tests/data/parser/err/0002_duplicate_shebang.txt
@@ -1,7 +1,7 @@
 FILE@[0; 42)
   SHEBANG@[0; 20)
-  ERROR@[20; 42)
   err: `expected item`
+  ERROR@[20; 42)
     WHITESPACE@[20; 21)
     SHEBANG@[21; 41)
     WHITESPACE@[41; 42)
diff --git a/tests/data/parser/err/0003_C++_semicolon.txt b/tests/data/parser/err/0003_C++_semicolon.txt
index affe8fd09..dc3cf6c73 100644
--- a/tests/data/parser/err/0003_C++_semicolon.txt
+++ b/tests/data/parser/err/0003_C++_semicolon.txt
@@ -32,7 +32,7 @@ FILE@[0; 40)
     COMMA@[36; 37)
     WHITESPACE@[37; 38)
     R_CURLY@[38; 39)
-  ERROR@[39; 40)
-  err: `expected item, found `;`
+    err: `expected item, found `;`
 consider removing this semicolon`
+  ERROR@[39; 40)
     SEMI@[39; 40)
diff --git a/tests/data/parser/err/0004_use_path_bad_segment.txt b/tests/data/parser/err/0004_use_path_bad_segment.txt
index 0a67002ac..d9ff79ebe 100644
--- a/tests/data/parser/err/0004_use_path_bad_segment.txt
+++ b/tests/data/parser/err/0004_use_path_bad_segment.txt
@@ -9,13 +9,13 @@ FILE@[0; 12)
               WHITESPACE@[3; 4)
               IDENT@[4; 7) "foo"
         COLONCOLON@[7; 9)
-        PATH_SEGMENT@[9; 9)
+        err: `expected SEMI`
         err: `expected identifier`
-    err: `expected SEMI`
+        err: `expected item`
+        PATH_SEGMENT@[9; 9)
   ERROR@[9; 11)
-  err: `expected item`
     INT_NUMBER@[9; 11)
-  ERROR@[11; 12)
-  err: `expected item, found `;`
+    err: `expected item, found `;`
 consider removing this semicolon`
+  ERROR@[11; 12)
     SEMI@[11; 12)
diff --git a/tests/data/parser/err/0005_attribute_recover.txt b/tests/data/parser/err/0005_attribute_recover.txt
index 731f5f2f8..74dd38959 100644
--- a/tests/data/parser/err/0005_attribute_recover.txt
+++ b/tests/data/parser/err/0005_attribute_recover.txt
@@ -9,12 +9,12 @@ FILE@[0; 54)
         META_ITEM@[6; 9)
           IDENT@[6; 9) "foo"
         COMMA@[9; 10)
-        ERROR@[10; 12)
         err: `expected attribute`
+        ERROR@[10; 12)
           WHITESPACE@[10; 11)
           PLUS@[11; 12)
+          err: `expected attribute`
         ERROR@[12; 14)
-        err: `expected attribute`
           COMMA@[12; 13)
           WHITESPACE@[13; 14)
         LITERAL@[14; 16)
@@ -43,7 +43,7 @@ FILE@[0; 54)
         L_PAREN@[39; 40)
         err: `expected attribute`
         WHITESPACE@[40; 41)
-      err: `expected R_BRACK`
+        err: `expected R_BRACK`
     FN_KW@[41; 43)
     NAME@[43; 47)
       WHITESPACE@[43; 44)
diff --git a/tests/data/parser/err/0006_named_field_recovery.txt b/tests/data/parser/err/0006_named_field_recovery.txt
index 2dec74866..cb5a9c32c 100644
--- a/tests/data/parser/err/0006_named_field_recovery.txt
+++ b/tests/data/parser/err/0006_named_field_recovery.txt
@@ -22,23 +22,26 @@ FILE@[0; 74)
       WHITESPACE@[22; 27)
       PUB_KW@[27; 30)
       WHITESPACE@[30; 31)
+      err: `expected field declaration`
     ERROR@[31; 38)
-    err: `expected field declaration`
       INT_NUMBER@[31; 33)
       WHITESPACE@[33; 38)
-    err: `expected COMMA`
+      err: `expected COMMA`
+      err: `expected field declaration`
     ERROR@[38; 40)
-    err: `expected field declaration`
       PLUS@[38; 39)
       WHITESPACE@[39; 40)
+      err: `expected COMMA`
+      err: `expected field declaration`
     ERROR@[40; 42)
-    err: `expected field declaration`
       MINUS@[40; 41)
       WHITESPACE@[41; 42)
+      err: `expected COMMA`
+      err: `expected field declaration`
     ERROR@[42; 48)
-    err: `expected field declaration`
       STAR@[42; 43)
       WHITESPACE@[43; 48)
+      err: `expected COMMA`
     NAMED_FIELD@[48; 58)
       VISIBILITY@[48; 52)
         PUB_KW@[48; 51)
diff --git a/tests/data/parser/err/0007_stray_curly_in_file.txt b/tests/data/parser/err/0007_stray_curly_in_file.txt
index 8a3cb5096..cfc714cc6 100644
--- a/tests/data/parser/err/0007_stray_curly_in_file.txt
+++ b/tests/data/parser/err/0007_stray_curly_in_file.txt
@@ -1,6 +1,6 @@
 FILE@[0; 31)
+err: `expected item`
   ERROR@[0; 3)
-  err: `expected item`
     R_CURLY@[0; 1)
     WHITESPACE@[1; 3)
   STRUCT_ITEM@[3; 14)
@@ -10,8 +10,8 @@ FILE@[0; 31)
       IDENT@[10; 11) "S"
     SEMI@[11; 12)
     WHITESPACE@[12; 14)
+    err: `expected item`
   ERROR@[14; 17)
-  err: `expected item`
     R_CURLY@[14; 15)
     WHITESPACE@[15; 17)
   FN_ITEM@[17; 29)
@@ -25,7 +25,7 @@ FILE@[0; 31)
       L_CURLY@[25; 26)
       R_CURLY@[26; 27)
       WHITESPACE@[27; 29)
+      err: `expected item`
   ERROR@[29; 31)
-  err: `expected item`
     R_CURLY@[29; 30)
     WHITESPACE@[30; 31)
diff --git a/tests/data/parser/err/0008_item_block_recovery.txt b/tests/data/parser/err/0008_item_block_recovery.txt
index 0e2aae7cc..ca332bcf0 100644
--- a/tests/data/parser/err/0008_item_block_recovery.txt
+++ b/tests/data/parser/err/0008_item_block_recovery.txt
@@ -12,18 +12,18 @@ FILE@[0; 95)
       WHITESPACE@[10; 11)
       R_CURLY@[11; 12)
       WHITESPACE@[12; 14)
+      err: `expected item`
   ERROR@[14; 17)
-  err: `expected item`
     IDENT@[14; 17) "bar"
+    err: `expected item`
   ERROR@[17; 18)
-  err: `expected item`
     L_PAREN@[17; 18)
+    err: `expected item`
   ERROR@[18; 20)
-  err: `expected item`
     R_PAREN@[18; 19)
     WHITESPACE@[19; 20)
+    err: `expected item`
   ERROR@[20; 82)
-  err: `expected item`
     L_CURLY@[20; 21)
     WHITESPACE@[21; 26)
     IF_KW@[26; 28)
diff --git a/tests/data/parser/err/0009_broken_struct_type_parameter.txt b/tests/data/parser/err/0009_broken_struct_type_parameter.txt
index 9434a764a..c16c6dffe 100644
--- a/tests/data/parser/err/0009_broken_struct_type_parameter.txt
+++ b/tests/data/parser/err/0009_broken_struct_type_parameter.txt
@@ -6,26 +6,26 @@ FILE@[0; 43)
       IDENT@[7; 8) "S"
     TYPE_PARAM_LIST@[8; 12)
       L_ANGLE@[8; 9)
-      ERROR@[9; 12)
       err: `expected type parameter`
+      ERROR@[9; 12)
         INT_NUMBER@[9; 11)
         WHITESPACE@[11; 12)
-      err: `expected COMMA`
-      err: `expected R_ANGLE`
-    err: `expected `;`, `{`, or `(``
+        err: `expected COMMA`
+        err: `expected R_ANGLE`
+        err: `expected `;`, `{`, or `(``
+        err: `expected item`
   ERROR@[12; 14)
-  err: `expected item`
     PLUS@[12; 13)
     WHITESPACE@[13; 14)
+    err: `expected item`
   ERROR@[14; 15)
-  err: `expected item`
     INT_NUMBER@[14; 15)
+    err: `expected item`
   ERROR@[15; 17)
-  err: `expected item`
     R_ANGLE@[15; 16)
     WHITESPACE@[16; 17)
+    err: `expected item`
   ERROR@[17; 33)
-  err: `expected item`
     L_CURLY@[17; 18)
     WHITESPACE@[18; 23)
     IDENT@[23; 24) "f"
diff --git a/tests/data/parser/inline/0006_extern_struct.txt b/tests/data/parser/inline/0006_extern_struct.txt
index 93a5b0477..f310e1225 100644
--- a/tests/data/parser/inline/0006_extern_struct.txt
+++ b/tests/data/parser/inline/0006_extern_struct.txt
@@ -2,7 +2,7 @@ FILE@[0; 19)
   ABI@[0; 7)
     EXTERN_KW@[0; 6)
     WHITESPACE@[6; 7)
-  err: `expected `fn` or `{``
+    err: `expected `fn` or `{``
   STRUCT_ITEM@[7; 19)
     STRUCT_KW@[7; 13)
     NAME@[13; 17)
diff --git a/tests/data/parser/inline/0013_unsafe_block_in_mod.txt b/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
index 5ddc1736c..3b56378a3 100644
--- a/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
+++ b/tests/data/parser/inline/0013_unsafe_block_in_mod.txt
@@ -11,8 +11,8 @@ FILE@[0; 33)
       R_CURLY@[9; 10)
       WHITESPACE@[10; 11)
   UNSAFE_KW@[11; 17)
-  ERROR@[17; 22)
   err: `expected `trait`, `impl` or `fn``
+  ERROR@[17; 22)
     WHITESPACE@[17; 18)
     L_CURLY@[18; 19)
     WHITESPACE@[19; 20)
diff --git a/tests/data/parser/inline/0023_array_type_missing_semi.txt b/tests/data/parser/inline/0023_array_type_missing_semi.txt
index bb30a2a2a..cc280d5a7 100644
--- a/tests/data/parser/inline/0023_array_type_missing_semi.txt
+++ b/tests/data/parser/inline/0023_array_type_missing_semi.txt
@@ -13,16 +13,16 @@ FILE@[0; 18)
         L_PAREN@[10; 11)
         R_PAREN@[11; 12)
         WHITESPACE@[12; 13)
-      err: `expected `;` or `]``
-    err: `expected SEMI`
+        err: `expected SEMI`
+        err: `expected `;` or `]``
+        err: `expected item`
   ERROR@[13; 15)
-  err: `expected item`
     INT_NUMBER@[13; 15)
+    err: `expected item`
   ERROR@[15; 16)
-  err: `expected item`
     R_BRACK@[15; 16)
-  ERROR@[16; 18)
-  err: `expected item, found `;`
+    err: `expected item, found `;`
 consider removing this semicolon`
+  ERROR@[16; 18)
     SEMI@[16; 17)
     WHITESPACE@[17; 18)
diff --git a/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt b/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
index dd6e24096..d6c27cf58 100644
--- a/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
+++ b/tests/data/parser/inline/0029_fn_pointer_type_missing_fn.txt
@@ -8,17 +8,17 @@ FILE@[0; 20)
     EQ@[7; 8)
     WHITESPACE@[8; 9)
     UNSAFE_KW@[9; 15)
-    err: `expected `fn``
     err: `expected SEMI`
+    err: `expected `fn``
     WHITESPACE@[15; 16)
+    err: `expected item`
   ERROR@[16; 17)
-  err: `expected item`
     L_PAREN@[16; 17)
+    err: `expected item`
   ERROR@[17; 18)
-  err: `expected item`
     R_PAREN@[17; 18)
-  ERROR@[18; 20)
-  err: `expected item, found `;`
+    err: `expected item, found `;`
 consider removing this semicolon`
+  ERROR@[18; 20)
     SEMI@[18; 19)
     WHITESPACE@[19; 20)
diff --git a/tests/parser.rs b/tests/parser.rs
index 68a6434be..35b91436a 100644
--- a/tests/parser.rs
+++ b/tests/parser.rs
@@ -1,15 +1,15 @@
 extern crate libsyntax2;
 extern crate testutils;
 
-use libsyntax2::{parse, tokenize};
-use libsyntax2::utils::dump_tree;
+use libsyntax2::{parse, tokenize, parse_green};
+use libsyntax2::utils::{dump_tree, dump_tree_green};
 use testutils::dir_tests;
 
 #[test]
 fn parser_tests() {
     dir_tests(&["parser/inline", "parser/ok", "parser/err"], |text| {
         let tokens = tokenize(text);
-        let file = parse(text.to_string(), &tokens);
-        dump_tree(&file)
+        let file = parse_green(text.to_string(), &tokens);
+        dump_tree_green(&file)
     })
 }