rus3 0.1.2 → 0.2.0

data/lib/rus3/repl.rb

@@ -21,13 +21,13 @@ module Rus3
   class Repl
 
     # Indicates the version of the Repl class.
-    VERSION = "0.1.0"
+    REPL_VERSION = "0.2.0"
 
     class << self
 
       # Starts REPL.
-      def start(verbose: false)
-        repl = Repl.new(verbose: verbose)
+      def start(parser: nil, evaluator: nil, verbose: false)
+        repl = Repl.new(parser: parser, evaluator: evaluator, verbose: verbose)
         repl.loop
       end
 
@@ -35,9 +35,9 @@ module Rus3
 
     # Hods major component names of the REPL.
     COMPONENTS = {
-      :parser => Parser::DEFAULT_PARSER,
-      :evaluator => Evaluator,
-      :printer => nil,
+      :parser    => Parser::DEFAULT_PARSER,
+      :evaluator => Evaluator::DEFAULT_EVALUATOR,
+      :printer   => nil,
     }
 
     # Prompt for input.
@@ -49,14 +49,20 @@ module Rus3
     @@value_history = []        # :nodoc:
 
     attr_accessor :verbose      # :nodoc:
+    attr_accessor :prompt       # :nodoc:
 
-    def initialize(verbose: false)
-      COMPONENTS.each { |name, klass|
+    def initialize(parser: nil, evaluator: nil, verbose: false)
+      comps = COMPONENTS.dup
+
+      comps[:parser] = Parser.const_get("#{parser.capitalize}Parser") if parser
+      comps[:evaluator] = Evaluator.const_get("#{evaluator.capitalize}Evaluator") if evaluator
+
+      comps.each { |name, klass|
         instance_variable_set("@#{name}", klass.nil? ? self : klass.new)
       }
 
       @prompt = PROMPT
-      @parser.prompt = PROMPT unless @parser.nil?
+      @parser.prompt = PROMPT
 
       @verbose = verbose
       @evaluator.verbose = verbose
@@ -73,15 +79,15 @@ module Rus3
     def loop
       msg = Kernel.loop {               # LOOP
         begin
-          exp = @parser.read(STDIN)     # READ
+          ast = @parser.read(STDIN)     # READ
         rescue SchemeSyntaxError => e
           puts "ERROR" + (@verbose ? "(READ)" : "")  + ": %s" % e
           next
         end
-        break FAREWELL_MESSAGE if exp.nil?
+        break FAREWELL_MESSAGE if ast.nil?
 
         begin
-          value = @evaluator.eval(exp)  # EVAL
+          value = @evaluator.eval(ast)  # EVAL
         rescue SyntaxError, StandardError => e
           puts "ERROR" + (@verbose ? "(EVAL)" : "")  + ": %s" % e
           next
@@ -96,15 +102,20 @@ module Rus3
 
     # Shows the greeting message.
     def greeting
-      puts "A simple REPL for Rus3:"
-      puts "- Rus3 version: #{Rus3::VERSION} (#{Rus3::RELEASE})"
+      puts "A simple REPL to run Rus3:"
       return unless @verbose
 
-      puts "  - REPL version: #{VERSION}"
+      vmsg =  "(rus3 :version #{Rus3::VERSION} :release #{Rus3::RELEASE}\n"
+      vmsg += "  (repl :version #{REPL_VERSION}\n"
+
+      comp_vmsgs = []
       COMPONENTS.keys.each { |comp_name|
-        Kernel.print "    - "
-        print_version(comp_name)
+        comp_vmsgs << "    (#{version_message(comp_name)})"
       }
+      vmsg += comp_vmsgs.join("\n")
+      vmsg += "))"
+
+      puts vmsg
     end
 
     # :stopdoc:
@@ -117,8 +128,8 @@ module Rus3
       Readline::readline(@prompt, true)
     end
 
-    def eval(exp)
-      exp
+    def eval(ast)
+      ast
     end
 
     def print(obj)
@@ -130,12 +141,21 @@ module Rus3
 
     private
 
+    def version_message(comp_name)
+      vmsg = nil
+      component = instance_variable_get("@#{comp_name}")
+      if component.nil? or component == self
+        vmsg = ":using :built-in :#{comp_name}"
+      else
+        vmsg = "#{component.version}"
+      end
+      vmsg
+    end
+
     def define_constants        # :nodoc:
       return if @evaluator.nil?
 
-      r = @evaluator.binding.receiver
-
-      r.instance_eval {
+      @evaluator.instance_eval {
         self.class.const_set(:RUS3_VERSION, "#{VERSION}")
       }
     end
@@ -143,9 +163,7 @@ module Rus3
     def define_help_feature     # :nodoc:
       return if @evaluator.nil?
 
-      r = @evaluator.binding.receiver
-
-      r.instance_eval {
+      @evaluator.instance_eval {
         def _help
           puts <<HELP
 A simple REPL for Rus3.
@@ -167,10 +185,8 @@ HELP
     def define_history_feature  # :nodoc:
       return if @evaluator.nil?
 
-      r = @evaluator.binding.receiver
-
-      r.instance_variable_set(:@value_history, @@value_history)
-      r.instance_eval {
+      @evaluator.instance_variable_set(:@value_history, @@value_history)
+      @evaluator.instance_eval {
 
         def _last_value
           @value_history[-1]
@@ -201,30 +217,24 @@ HELP
     def define_load_feature
       return if @evaluator.nil?
 
-      r = @evaluator.binding.receiver
-
-      r.instance_variable_set(:@scm_parser, Parser::SchemeParser.new)
-      r.instance_eval {
+      @evaluator.instance_variable_set(:@scm_parser, @parser)
+      @evaluator.instance_variable_set(:@scm_evaluator, @evaluator)
+      @evaluator.instance_eval {
         def load_scm(path)
           raise Rus3::CannotFindFileError, path unless FileTest.exist?(path)
-          scm_source = nil
-          File.open(path, "r") {|f| scm_source = f.readlines(chomp: true)}
-          s_exp = scm_source.join(" ")
-          r_exp = @scm_parser.parse(s_exp)
-          self.binding.eval(r_exp)
+          scheme_source = File.readlines(path, chomp: true).join(" ")
+          result = ast = nil
+          if @scm_parser.respond_to?(:parse)
+            ast = @scm_parser.parse(scheme_source)
+          end
+          if @scm_evaluator.respond_to?(:eval)
+            result = @scm_evaluator.eval(ast)
+          end
+          pp result
         end
       }
     end
 
-    def print_version(comp_name)
-      component = instance_variable_get("@#{comp_name}")
-      if component.nil? or component == self
-        puts "using built-in #{comp_name.upcase}"
-      else
-        puts "#{component.version}"
-      end
-    end
-
     def history_push(value)
       prev_value = @@value_history[-1]
       if prev_value != value and UNDEF != value

data/lib/rus3/token.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Rus3
+
+  TOKEN_TYPES = [             # :nodoc:
+    # delimiters
+    :lparen,                  # `(`
+    :rparen,                  # `)`
+    :vec_lparen,              # `#(`
+    :bytevec_lparen,          # `#u8(`
+    :quotation,               # `'`
+    :backquote,               # "`" (aka quasiquote)
+    :comma,                   # `,`
+    :comma_at,                # `,@`
+    :dot,                     # `.`
+    :semicolon,               # `;`
+    :comment_lparen,          # `#|`
+    :comment_rparen,          # `|#`
+    # value types
+    :identifier,              # `foo`
+    :boolean,                 # `#f` or `#t` (`#false` or `#true`)
+    :number,                  # `123`, `456.789`, `1/2`, `3+4i`
+    :character,               # `#\a`
+    :string,                  # `"hoge"`
+    # operators
+    :op_proc,                 # `+`, `-`, ...
+    # control
+    :illegal,
+  ]
+
+  Token = Struct.new(:type, :literal) {
+    alias :to_s :literal
+  }
+
+end

data/lib/rus3/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Rus3
-  VERSION = "0.1.2"
-  RELEASE = "2021-04-23"
+  VERSION = "0.2.0"
+  RELEASE = "2021-05-03"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rus3
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - mnbi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies: []
 description: Ruby with Syntax Sugar of Scheme
 email:
@@ -33,12 +33,19 @@ files:
 - examples/iota.scm
 - exe/rus3
 - lib/rus3.rb
+- lib/rus3/ast.rb
+- lib/rus3/ast/branch_node.rb
+- lib/rus3/ast/error.rb
+- lib/rus3/ast/leaf_node.rb
 - lib/rus3/char.rb
 - lib/rus3/error.rb
 - lib/rus3/evaluator.rb
+- lib/rus3/evaluator/environment.rb
+- lib/rus3/evaluator/scheme_evaluator.rb
+- lib/rus3/evaluator/translator.rb
+- lib/rus3/lexer.rb
 - lib/rus3/pair.rb
 - lib/rus3/parser.rb
-- lib/rus3/parser/lexer.rb
 - lib/rus3/parser/scheme_parser.rb
 - lib/rus3/port.rb
 - lib/rus3/printer.rb
@@ -50,6 +57,7 @@ files:
 - lib/rus3/procedure/vector.rb
 - lib/rus3/procedure/write.rb
 - lib/rus3/repl.rb
+- lib/rus3/token.rb
 - lib/rus3/vector.rb
 - lib/rus3/version.rb
 - rus3.gemspec