doc/grammar.bnf

@@ -4,14 +4,10 @@ EXPR ::=
 | int
 | ident
 | VARDECL
-| FUNDECL
 | FUNCALL
 | LAMBDA
-| BLOCK
 VARDECL ::= opar decl ident EXPR cpar
-FUNDECL ::= opar decl opar ident* cpar BODY cpar
 FUNCALL ::= opar EXPR EXPR* cpar
 LAMBDA ::= opar lambda opar PARAMS cpar BODY cpar
 PARAMS ::= ident*
 BODY ::= EXPR*
-BLOCK ::= opar colon EXPR* cpar

examples/block.gri

@@ -1,14 +0,0 @@
-(assert-eq? 6 (: 2 4 6))
-(assert-eq? 9 (: 2 4 (: 3 0 9)))
-
-(:
-  ($ a 4)
-  (assert-eq? 4 a)
-
-  (:
-    ($ a 7)
-    (assert-eq? 7 a)
-  )
-
-  (assert-eq? 4 a)
-)

examples/fun.gri

@@ -8,11 +8,3 @@
 
 ;; calling function literal
 (assert-eq? 7 ( (-> (x y) (+ x y 1)) 2 4 ))
-
-;; syntaxic sugar for function declaration
-($ (c n) (* 2 n))
-(assert-eq? 18 (c 9))
-
-;; inner variable
-($ (d x) ($ y 3) (+ x y))
-(assert-eq? 7 (d 4))

examples/if.gri

@@ -1,11 +0,0 @@
-(assert-eq? 7 (if true 7 9))
-(assert-eq? 9 (if false 7 9))
-
-($ (max x y)
-   (if (> x y)
-       x
-       y
-))
-
-(assert-eq? 32 (max 3 32))
-(assert-eq? 329 (max 329 32))

lib/core.cpp

@@ -4,28 +4,6 @@
 
 GRINO_ERROR(assertion_error);
 
-extern "C" void lib_flow_control(grino::Loader& loader)
-{
-  loader.add_static("if", [](auto& compiler, auto node, auto& prog, auto& sym) {
-    auto cond_node = node->child(1).lock();
-    auto then_node = node->child(2).lock();
-    auto else_node = node->child(3).lock();
-
-    compiler.compile(cond_node, prog, sym);
-    size_t brf = prog.size();
-    prog.push_instr(grino::OPCODE_BRF, 0);
-
-    compiler.compile(then_node, prog, sym);
-    size_t br = prog.size();
-    prog.push_instr(grino::OPCODE_BR, 0);
-
-    prog.set_param(brf, prog.size());
-    compiler.compile(else_node, prog, sym);
-
-    prog.set_param(br, prog.size());
-  });
-}
-
 extern "C" void lib_int(grino::Loader& loader)
 {
   loader.add_native("+", [](auto args){
@@ -328,7 +306,6 @@ extern "C" void lib(grino::Loader& loader)
   lib_int(loader);
   lib_cmp(loader);
   lib_bool(loader);
-  lib_flow_control(loader);
 
   loader.add_native("dump", [](auto args){
     std::string sep;

src/Compiler.cpp

@@ -40,24 +40,6 @@ namespace grino
                 program.push_instr(OPCODE_POP);
               }
           }
-          } break;
-
-      case NODE_BLOCK: {
-        enter_scope();
-
-        for (size_t i=0; i<node->size(); i++)
-          {
-            compile(node->child(i).lock(), program, sym);
-
-            if (i < node->size() - 1)
-              {
-                program.push_instr(OPCODE_POP);
-              }
-          }
-
-        leave_scope();
-        sym.purge(m_scope.size());
-
       } break;
 
       case NODE_FUNCALL: {
@@ -84,7 +66,7 @@ namespace grino
       case NODE_LAMBDA: {
         auto params = node->child(0).lock();
 
-        enter_scope(true);
+        enter_scope();
 
         for (size_t i=0; i<params->size(); i++)
           {
@@ -175,16 +157,9 @@ namespace grino
     return m_scope.back() - 1;
   }
 
-  void Compiler::enter_scope(bool reset)
+  void Compiler::enter_scope()
   {
-    if (m_scope.empty() || reset)
+    m_scope.push_back(0);
-      {
-        m_scope.push_back(0);
-      }
-    else
-      {
-        m_scope.push_back(m_scope.back());
-      }
   }
 
   void Compiler::leave_scope()

src/Compiler.hpp

@@ -35,7 +35,7 @@ namespace grino
     std::vector<size_t> m_scope;
 
     size_t get_local_address();
-    void enter_scope(bool reset=false);
+    void enter_scope();
     void leave_scope();
   };
 }

src/Lexer.cpp

@@ -7,7 +7,6 @@ namespace grino
     : m_logger { logger }
     , m_loc {source_path, 1}
   {
-    add_text(NODE_COLON, ":", false);
     add_text(NODE_OPAR, "(", false);
     add_text(NODE_CPAR, ")", false);
     add_text(NODE_DECL, "$", false);

src/Node.hpp

@@ -16,9 +16,7 @@
     G(NODE_DECL),                               \
     G(NODE_LAMBDA),                             \
     G(NODE_PARAMS),                             \
-    G(NODE_BODY),                               \
+    G(NODE_BODY),
-    G(NODE_COLON),                              \
-    G(NODE_BLOCK)
 
 namespace grino
 {

src/Parser.cpp

@@ -118,16 +118,6 @@ namespace grino
 
   std::shared_ptr<Node> Parser::parse_expr()
   {
-    if (type_is({NODE_OPAR, NODE_COLON}))
-      {
-        return parse_block();
-      }
-
-    if (type_is({NODE_OPAR, NODE_DECL, NODE_OPAR}))
-      {
-        return parse_fundecl();
-      }
-
     if (type_is({NODE_OPAR, NODE_DECL}))
       {
         return parse_vardecl();
@@ -174,31 +164,6 @@ namespace grino
     return node;
   }
 
-  std::shared_ptr<Node> Parser::parse_fundecl()
-  {
-    consume(NODE_OPAR);
-    consume(NODE_DECL);
-
-    consume(NODE_OPAR);
-    auto ident = consume(NODE_IDENT);
-
-    auto params = parse_params();
-    consume(NODE_CPAR);
-
-    auto body = parse_body();
-    consume(NODE_CPAR);
-
-    auto lambda = make_node(NODE_LAMBDA);
-    lambda->add_child(params);
-    lambda->add_child(body);
-
-    auto node = make_node(NODE_VARDECL);
-    node->add_child(ident);
-    node->add_child(lambda);
-
-    return node;
-  }
-
   std::shared_ptr<Node> Parser::parse_funcall()
   {
     consume(NODE_OPAR);
@@ -255,21 +220,4 @@ namespace grino
     return node;
   }
 
-  std::shared_ptr<Node> Parser::parse_block()
-  {
-    auto node = make_node(NODE_BLOCK);
-
-    consume(NODE_OPAR);
-    consume(NODE_COLON);
-
-    while (!type_is(NODE_CPAR))
-      {
-        node->add_child(parse_expr());
-      }
-
-    consume(NODE_CPAR);
-
-    return node;
-  }
-
 }

src/Parser.hpp

@@ -35,12 +35,10 @@ namespace grino
     std::shared_ptr<Node> parse_module();
     std::shared_ptr<Node> parse_expr();
     std::shared_ptr<Node> parse_vardecl();
-    std::shared_ptr<Node> parse_fundecl();
     std::shared_ptr<Node> parse_funcall();
     std::shared_ptr<Node> parse_lambda();
     std::shared_ptr<Node> parse_params();
     std::shared_ptr<Node> parse_body();
-    std::shared_ptr<Node> parse_block();
   };
 }
 

tests/Lexer.cpp

@@ -99,12 +99,3 @@ TEST_CASE_METHOD(LexerTest, "Lexer_lambda")
   test_next(lexer, "LAMBDA");
   test_end(lexer);
 }
-
-TEST_CASE_METHOD(LexerTest, "Lexer_block")
-{
-  grino::Lexer lexer {m_logger, "tests/lexer"};
-
-  lexer.scan(" : ");
-  test_next(lexer, "COLON");
-  test_end(lexer);
-}

tests/Parser.cpp

@@ -74,16 +74,3 @@ TEST_CASE_METHOD(ParserTest, "Parser_lambda")
              "( (-> (x) x ) 4 )");
 
 }
-
-TEST_CASE_METHOD(ParserTest, "Parser_fundecl")
-{
-  test_parse("MODULE(VARDECL(IDENT[f],LAMBDA(PARAMS(IDENT[x]),"
-             "BODY(FUNCALL(IDENT[+],IDENT[x],INT[1])))))",
-             "($ (f x) (+ x 1))");
-}
-
-TEST_CASE_METHOD(ParserTest, "Parser_block")
-{
-  test_parse("MODULE(BLOCK(INT[1],BOOL[true],IDENT[salut]))",
-             "(: 1 true salut )");
-}