Unsafe blocks

matklad · Sep 2, 2017 · 3022be4 · 3022be4
1 parent a8df6d0
commit 3022be4
Show file tree

Hide file tree

Showing 3 changed files with 210 additions and 144 deletions.
diff --git a/lang/rust/src/rust.fall b/lang/rust/src/rust.fall
@@ -32,6 +32,7 @@ tokenizer {
   match 'match'
   return 'return'
   in 'in'
+  unsafe 'unsafe'
 
   l_paren '('
   r_paren ')'
@@ -645,7 +646,7 @@ fn main() { return; return (); }
 #[atom]
 pub rule block_expr {
   <without_restrictions
-    <block {block_form* expr?}>
+    {'unsafe'? <block {block_form* expr?}>}
   >
 }
 
@@ -665,6 +666,15 @@ pub rule expr_stmt {
   >
 }
 
+test r"
+fn main() {
+    {1};
+    {1}
+    {1;}
+    unsafe { let _ = (); }
+}
+"
+
 #[atom]
 pub rule if_expr {
   'if' <commit>  

diff --git a/lang/rust/src/rust.rs b/lang/rust/src/rust.rs
diff --git a/lang/rust/tests/inline.txt b/lang/rust/tests/inline.txt
@@ -915,6 +915,59 @@ FILE
         SEMI ";"
       R_CURLY "}"
 
+----------------------------------------
+fn main() {
+    {1};
+    {1}
+    {1;}
+    unsafe { let _ = (); }
+}
+
+FILE
+  FN_DEF
+    FN "fn"
+    IDENT "main"
+    L_PAREN "("
+    R_PAREN ")"
+    BLOCK_EXPR
+      L_CURLY "{"
+      EXPR_STMT
+        BLOCK_EXPR
+          L_CURLY "{"
+          LITERAL
+            NUMBER "1"
+          R_CURLY "}"
+      EMPTY_STMT
+        SEMI ";"
+      EXPR_STMT
+        BLOCK_EXPR
+          L_CURLY "{"
+          LITERAL
+            NUMBER "1"
+          R_CURLY "}"
+      EXPR_STMT
+        BLOCK_EXPR
+          L_CURLY "{"
+          EXPR_STMT
+            LITERAL
+              NUMBER "1"
+            SEMI ";"
+          R_CURLY "}"
+      BLOCK_EXPR
+        UNSAFE "unsafe"
+        L_CURLY "{"
+        LET_STMT
+          LET "let"
+          WILDCARD_PATTERN
+            UNDERSCORE "_"
+          EQ "="
+          UNIT_EXPR
+            L_PAREN "("
+            R_PAREN ")"
+          SEMI ";"
+        R_CURLY "}"
+      R_CURLY "}"
+
 ----------------------------------------
 fn main() { 
   if true { foo } else { bar }