rubasteme 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db8dd40c792c40ff4b5a60cfdf1e1ca6ec79384fc4b2fc773f4ed6b0882d1bc0
-  data.tar.gz: 2fec3b113e8fb7ed3da8199102b8df2999dafd116666586fc4405b8a21dd539b
+  metadata.gz: 55b3523ac9cea424c63244acb962f5a8c282515339cbf957ff34bd691ff3d5ef
+  data.tar.gz: 25f8653c598ac0cb61d3fd3c8277548f4b0ea033bc4d2fdb37fbab81efd8642f
 SHA512:
-  metadata.gz: ca78d9e9ae1c06e7e0cb19bf313f7e2fe6aa8e407d0927b77d8a86c7a1414dea44937924058fbb66c812804a66753891c508d155c3826cced645b813ba376845
-  data.tar.gz: 005c8b48680a091d3a8867341a5cc4e845ec7b0b299b0d862cea9830cd9c9b20951cf49ef7da2c917e5a1df0c3666cdc34bf5a4598c92ec4de4d8c8eff97d5a0
+  metadata.gz: 0b35c5f9339f74b843a2d19977fb1a5e08e0e018b59b699bd4d58f88ee7d541f24be08054bd5d5e96e48c9bfcf5995e441df330cbbe33e7990ee61e7824c6e70
+  data.tar.gz: 531caab37c793ebcef980fe0f146158871c374a47e6eca90778d7bba05de3d6834d51f4d169f8f13b6b9c96ab7a9129b7ee60658116005080afb2fccd074176e

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 ## [Unreleased]
 - (nothing to record here)
 
+## [0.1.5] - 2021-06-09
+### Added
+- Add a new node to represent `case` expression and its parsing.
+
+### Changed
+- Refactor parser to parse in 2 phases.
+
+### Fixed
+- Fix #5: incorrect parsing with internal definition at wrong
+  position.
+
 ## [0.1.4] - 2021-05-31
 ### Added
 - Add a new node to represent sequence. (#3)

data/examples/mini_rus3

@@ -189,7 +189,7 @@ class Evaluator
 
 end
 
-parser = Rubasteme::Parser.new
+parser = Rubasteme.parser
 evaluator = Evaluator.new
 
 require "readline"

data/examples/mini_sicp_scheme

@@ -25,7 +25,7 @@ module SicpScheme
 
   def self.repl(prompt)
     env = TOPLEVEL_ENV
-    parser = Rubasteme::Parser.new
+    parser = Rubasteme.parser
     evaluator = Evaluator.new
     printer = Printer.new
 

data/lib/rbscmlex/missing.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Rbscmlex
+
+  # :stopdoc:
+  EMSG = {
+    unexpected_token_type: "unexpected token type: got=%s, expected=%s",
+    missing_right_parenthesis: "missing right parenthesis",
+  }
+  # :startdoc:
+
+  # Indicates a token is not expected one.
+  class UnexpectedTokenTypeError < Error
+    def initialize(got, expected = nil)
+      super(EMSG[:unexpected_token_type] % [got, expected])
+    end
+  end
+
+  # Indicates a mismatch of parenthesizes.
+  class MissingRightParenthesisError < Error
+    def initialize
+      super(EMSG[:missing_right_parenthesis])
+    end
+  end
+
+  class Lexer
+
+    def skip_lparen(offset = 0)
+      if peek_token(offset).type == :lparen
+        skip_token(offset)
+      else
+        raise UnexpectedTokenTypeError.new(peek_token(offset).type, :lparen)
+      end
+    end
+
+    def skip_rparen(offset = 0)
+      if peek_token(offset).type == :rparen
+        skip_token(offset)
+      else
+        raise MissingRightParenthesisError
+      end
+    end
+
+  end
+
+end

data/lib/rubasteme.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rbscmlex"
+require_relative "rbscmlex/missing"
 
 module Rubasteme
 
@@ -8,6 +9,10 @@ module Rubasteme
     Rbscmlex::Lexer.new(obj)
   end
 
+  def self.parse(source)
+    parser.parse(lexer(source))
+  end
+
   require_relative "rubasteme/error"
   require_relative "rubasteme/utils"
   require_relative "rubasteme/ast"

data/lib/rubasteme/ast.rb

@@ -19,8 +19,8 @@ module Rubasteme
       :ast_dot,
       # branch
       :ast_program,
-      :ast_list,
       :ast_vector,
+      :ast_list,
       :ast_quotation,
       :ast_procedure_call,
       :ast_lambda_expression,
@@ -33,9 +33,12 @@ module Rubasteme
       :ast_identifier_definition,
       :ast_cond,
       :ast_cond_clause,
-      :ast_else_clause,
       :ast_cond_recipient_clause,
+      :ast_else_clause,
       :ast_case,
+      :ast_case_clause,
+      :ast_data,
+      :ast_case_recipient_clause,
       :ast_else_recipient_clause,
       :ast_and,
       :ast_or,
@@ -56,7 +59,7 @@ module Rubasteme
       :ast_illegal,
     ]
 
-    def self.instantiate(ast_node_type, literal)
+    def self.instantiate(ast_node_type, literal = nil)
       type_name = Utils.camel_case(ast_node_type.to_s.delete_prefix("ast_"))
       klass = AST.const_get("#{type_name}Node")
 

data/lib/rubasteme/ast/branch_node.rb

@@ -55,8 +55,8 @@ module Rubasteme
     end
 
     class ListNode < BranchNode
-      def initialize(_ = nil)
-        super(nil)
+      def initialize(initial_size = 0, _ = nil)
+        super(initial_size)
       end
 
       def empty?
@@ -78,14 +78,14 @@ module Rubasteme
 
     class QuotationNode < ListNode
       def initialize(_ = nil)
-        super(nil)
+        super(0, nil)
       end
     end
 
     class ProcedureCallNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<operator>, <operand>*]
-        super(1)
+        super(1, _)
       end
 
       def operator
@@ -108,7 +108,7 @@ module Rubasteme
     class LambdaExpressionNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<formals>, <body>]
-        super(2)
+        super(2, _)
       end
 
       def formals
@@ -131,7 +131,7 @@ module Rubasteme
     class FormalsNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<identifier 1>, <identifier 2>, ... ]
-        super(nil)
+        super(0, nil)
       end
 
       def add_identifier(node)
@@ -142,7 +142,7 @@ module Rubasteme
     class HoldingSequenceBaseNode < ListNode
       def initialize(initial_size = 0, sequence_pos = 0, _ = nil)
         # @nodes = [..., <sequence>, ...]
-        super(initial_size)
+        super(initial_size, _)
         @sequence_pos = sequence_pos
       end
 
@@ -173,7 +173,7 @@ module Rubasteme
     class InternalDefinitionsNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<definition 1>, <definition 2>, ... ]
-        super(nil)
+        super(0, nil)
       end
 
       def add_definition(node)
@@ -184,7 +184,7 @@ module Rubasteme
     class SequenceNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<expression 1>, <expression 2>, ... ]
-        super(nil)
+        super(0, _)
       end
 
       def add_expression(node)
@@ -196,7 +196,7 @@ module Rubasteme
       def initialize(_ = nil)
         # @nodes = [<test>, <consequent>] or
         #          [<test>, <consequent>, <alternate>]
-        super(1)
+        super(2, _)
       end
 
       def test
@@ -231,7 +231,7 @@ module Rubasteme
     class AssignmentNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<identifier>, <expression>]
-        super(2)
+        super(2, _)
       end
 
       def identifier
@@ -255,7 +255,7 @@ module Rubasteme
       def initialize(_ = nil)
         # @nodes = [<identifier>, <expression>]
         #   <expression> might be a lambda expression.
-        super(2)
+        super(2, _)
       end
 
       def identifier
@@ -291,7 +291,7 @@ module Rubasteme
 
     class CondNode < ListNode
       def initialize(_ = nil)
-        super(nil)
+        super(0, _)
       end
 
       def cond_clauses
@@ -324,7 +324,7 @@ module Rubasteme
       def initialize(initial_size = 0, recipient_pos = 0, _ = nil)
         # @nodes = [<recipient>]
         # <recipient> -> <expression>
-        super(initial_size)
+        super(initial_size, _)
         @recipient_pos = recipient_pos
       end
 
@@ -360,25 +360,86 @@ module Rubasteme
       end
     end
 
+    class CaseNode < ListNode
+      def initialize(_ = nil)
+        # @nodes = [<expression>, <case caluse>, ... <else clause>]
+        super(1, _)
+      end
+
+      def expression
+        @nodes[0]
+      end
+
+      def expression=(node)
+        @nodes[0] = node
+      end
+
+      def case_clauses
+        @nodes[1..-1]
+      end
+
+      def add_clause(node)
+        @nodes << node
+      end
+    end
+
+    class CaseClauseNode < HoldingSequenceBaseNode
+      def initialize(_ = nil)
+        # @nodes = [<data>, <sequence>]
+        super(2, 1, _)
+      end
+
+      def data
+        @nodes[0]
+      end
+
+      def data=(node)
+        @nodes[0] = node
+      end
+    end
+
+    class DataNode < ListNode
+      def initialize(_ = nil)
+        # @nodes = [<datum>, ...]
+        super(0, _)
+      end
+    end
+
+    class CaseRecipientClauseNode < RecipientClauseBaseNode
+      def initialize(_ = nil)
+        # ( ( <datum>* ) => <recipient> )
+        # @nodes = [<data>, <recipient>]
+        super(2, 1, _)
+      end
+
+      def data
+        @nodes[0]
+      end
+
+      def data=(node)
+        @nodes[0] = node
+      end
+    end
+
     class ElseRecipientClauseNode < RecipientClauseBaseNode
       def initialize(_ = nil)
         # ( else => <recipient> )
         # @nodes = [<recipient>]
-        super(1, 0)
+        super(1, 0, _)
       end
     end
 
     class AndNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<test>, ...]
-        super(nil)
+        super(0, _)
       end
     end
 
     class OrNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<test>, ...]
-        super(nil)
+        super(0, _)
       end
     end
 
@@ -407,7 +468,7 @@ module Rubasteme
       def initialize(_ = nil)
         # @nodes = [<bindings>, <body>] or
         #          [<identifier>, <bindings>, <body>]
-        super(1)
+        super(1, _)
       end
 
       def identifier
@@ -449,7 +510,7 @@ module Rubasteme
     class LetBaseNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<bindings>, <body>]
-        super(2)
+        super(2, _)
       end
 
       def bindings
@@ -481,7 +542,7 @@ module Rubasteme
     class BindingsNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<bind spec 1>, <bind spec 2> , ...]
-        super(nil)
+        super(0, _)
       end
 
       def add_bind_spec(node)
@@ -491,7 +552,7 @@ module Rubasteme
 
     class BindSpecNode < ListNode
       def initialize(_ = nil)
-        super(2)
+        super(2, _)
       end
 
       def identifier
@@ -521,7 +582,7 @@ module Rubasteme
     class DoNode < ListNode
       def initialize(_ = nil)
         # @nodes = [<iteration bindings>, <test and do result>, <command>, ...]
-        super(2)
+        super(2, _)
       end
 
       def iteration_bindings
@@ -551,7 +612,7 @@ module Rubasteme
 
     class IterationBindingsNode < ListNode
       def initialize(_ = nil)
-        super(nil)
+        super(0, _)
       end
 
       def add_iteration_spec(node)
@@ -559,28 +620,14 @@ module Rubasteme
       end
     end
 
-    class TestAndDoResultNode < ListNode
-      def initialize(_ = nil)
-        super(1)
-      end
-
-      def test
-        @nodes[0]
-      end
-
-      def test=(node)
-        @nodes[0] = node
-      end
-
-      def add_expression(node)
-        @nodes << node
-      end
+    class TestAndDoResultNode < TestAndSequenceBaseNode
     end
 
     class IterationSpecNode < ListNode
       def initialize(_ = nil)
-        # @nodes = [<identifier>, <init>, <step>]
-        super(3)
+        # 1. @nodes = [<identifier>, <init>, <step>]
+        # 2. @nodes = [<identifier>, <init>]
+        super(2, _)
       end
 
       def identifier

data/lib/rubasteme/ast/leaf_node.rb

@@ -32,6 +32,10 @@ module Rubasteme
       def initialize(literal)
         super
       end
+
+      def identifier
+        literal
+      end
     end
 
     class CharacterNode < LeafNode