Syntax: typos

nois-lang · Apr 19, 2024 · 4e18b80 · 4e18b80
1 parent 5dc90f8
commit 4e18b80
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/data/syntax.no b/data/syntax.no
@@ -9,6 +9,7 @@ trait Baz<U> { fn a(self): Unit fn f<T>(self): T {} }
 impl <T> Baz<Option<T>> for Bar<T> { fn f(self): T {} }
 fn foo<T: std::io::Show + U, U>(b: T): Option<U> {
     let a = [1, "str", 'c', true, Option::None(), Option::Some(value: 1), Option::Some(2)]
+    let s = "interp {foo("nest {'b'}")}"
     let Foo::Foo(x) = Foo::Foo(4)
     let b = if a.next().isSome() { a } else { [] }
     let b2 = a.next()!.await?
@@ -18,9 +19,11 @@ fn foo<T: std::io::Show + U, U>(b: T): Option<U> {
     match c.foo() {
         -5 if a.count() > 6 {}
         a @ V::B(v, o: _) {}
+        [1, s @ _, tail] {}
         V::B() {}
         "str" {}
         'c' {}
         _ {}
     }
 }
+
diff --git a/nois.bnf b/nois.bnf
@@ -66,7 +66,6 @@ statement             ::= var-def | fn-def | trait-def | impl-def | type-def | r
       div-op          ::= SLASH;
       exp-op          ::= CARET;
       mod-op          ::= PERCENT;
-      access-op       ::= PERIOD;
       eq-op           ::= EQUALS EQUALS;
       ne-op           ::= EXCL EQUALS;
       ge-op           ::= C-ANGLE EQUALS;
@@ -141,7 +140,7 @@ pattern               ::= pattern-bind? pattern-expr
                       ;
     con-pattern       ::= identifier con-pattern-params
                       ;
-    con-pattern-parms ::= O-PAREN (field-pattern (COMMA field-pattern)*)? COMMA? C-PAREN
+    con-pattern-params::= O-PAREN (field-pattern (COMMA field-pattern)*)? COMMA? C-PAREN
                       ;
       field-pattern   ::= NAME (COLON pattern)?
                       ;
@@ -153,7 +152,7 @@ number                ::= MINUS? (INT | FLOAT)
                       ;
 string                ::= D-QUOTE string-part* D-QUOTE
                       ;
-string-part           ::= STRING | O-BRACE operand C-BRACE
+string-part           ::= STRING | O-BRACE expr C-BRACE
                       ;
 bool                  ::= TRUE | FALSE
                       ;
diff --git a/src/ast/op.ts b/src/ast/op.ts
@@ -106,7 +106,6 @@ export const buildBinaryOp = (node: ParseNode): BinaryOp => {
             'div-op',
             'exp-op',
             'mod-op',
-            'access-op',
             'eq-op',
             'ne-op',
             'ge-op',

diff --git a/src/parser/fns/expr.ts b/src/parser/fns/expr.ts
@@ -199,7 +199,7 @@ export const parseString = (parser: Parser): void => {
 }
 
 /*
- * string-part ::= STRING | O-BRACE operand C-BRACE
+ * string-part ::= STRING | O-BRACE expr C-BRACE
  */
 export const parseStringPart = (parser: Parser): void => {
     const mark = parser.open()

diff --git a/src/parser/index.ts b/src/parser/index.ts
@@ -54,7 +54,6 @@ export const treeKinds = <const>[
     'unwrap-op',
     'bind-op',
     'await-op',
-    'access-op',
     'arg',
     'closure-expr',
     'closure-params',