flea 0.1.0 → 0.1.1

data/lib/flea/interpreter.rb

@@ -1,67 +1,67 @@
+# frozen_string_literal: true
+
 module Flea
   class Interpreter
-   
-   attr_accessor :base_environment, 
-                 :current_environment,
-                 :parser
-   
-    def initialize(options = {})
-      options = {
-        :base_environment => Environment.new,
-        :load_standard_library => true
-      }.merge(options)
-      
-      @base_environment = @current_environment = options[:base_environment]
-      @parser = Sexpistol.new
-      @parser.ruby_keyword_literals = false
-      @parser.scheme_compatability = true
-      
-      load_standard_library unless options[:load_standard_library] == false
+    attr_accessor :base_environment, :current_environment
+
+    def initialize(environment: Environment.new, standard_library: true)
+      @base_environment = @current_environment = environment
+
+      load_standard_library if standard_library
     end
-    
+
     def run(program)
-      expressions = parse(program)
+      program = parse(program)
       result = nil
-      expressions.each do |expression|
-        result = evaluate(expression)
-      end
       
-      return result
-    end
-    
-    def parse(string)
-      return @parser.parse_string(string)
+
+
+      if program.is_a?(Sexpistol::SExpressionArray)
+        program.each do |expression|
+          result = evaluate(expression)
+        end
+        
+      else
+        result = evaluate(program)
+      end
+
+      result
     end
-    
+
     def evaluate(expression)
       return @current_environment.find(expression) if expression.is_a? Symbol
       return expression unless expression.is_a? Array
-      
-      if expression[0] == :define
-        return @current_environment.define expression[1], evaluate(expression[2])
-        
-      elsif expression[0] == :native_function
-        return eval expression[1]
-        
-      else # function call
+
+      case expression[0]
+      when :define then @current_environment.define(expression[1], evaluate(expression[2]))
+      when :native_function then eval expression[1]
+      else
         function = evaluate(expression[0])
-        raise RuntimeError, "\n#{@parser.to_sexp(expression)}\n ^\n\n#{expression[0]} is not a function" unless function.is_a? Proc
+        raise "\n#{to_sexp(expression)}\n ^\n\n#{expression[0]} is not a function\n\n#{@current_environment.table.keys}" unless function.is_a? Proc
+
         arguments = expression.slice(1, expression.length)
-        return function.call(arguments, self)
+        function.call(arguments, self)
       end
     end
-    
-    private 
-    
+
+    def parse(string)
+      Sexpistol.parse(string, parse_ruby_keyword_literals: true)
+    end
+
+    def to_sexp(expression)
+      Sexpistol.to_sexp(expression, scheme_compatability: true)
+    end
+
+    private
+
     def load_standard_library
       library_pattern = File.join(File.dirname(__FILE__), 'standard_library', '*.scm')
-      
+
       Dir[library_pattern].each do |item|
         File.open(item) do |file|
           run(file.read)
         end
       end
     end
-    
   end
-end
+end

data/lib/flea/standard_library/display.scm

@@ -2,7 +2,13 @@
   (native_function "
     Proc.new() do |arguments, interpreter|
       output = interpreter.evaluate(arguments[0])
-      print interpreter.parser.to_sexp(output)
+
+      if output.is_a?(String)
+        print output
+      else
+        print interpreter.to_sexp(output)
+      end
+
       output
     end
   "))

data/lib/flea/standard_library/null.scm

@@ -1,3 +1,3 @@
 (define null?
   (lambda (arg)
-    (equal? arg '())))
+    (equal? arg (quote ()))))

data/lib/flea/standard_library/read.scm

@@ -1,6 +1,6 @@
 (define read
   (native_function "
     Proc.new() do |arguments, interpreter|
-      interpreter.parser.parse_string($stdin.gets)
+      interpreter.parse($stdin.gets)
     end
   "))

data/lib/flea/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Flea
+  VERSION = '0.1.1'
+end

data/lib/flea.rb

@@ -1,5 +1,7 @@
-require "rubygems"
-require "sexpistol"
+# frozen_string_literal: true
 
-require File.expand_path(File.join(File.dirname(__FILE__), "flea", "environment.rb"))
-require File.expand_path(File.join(File.dirname(__FILE__), "flea", "interpreter.rb"))
+require 'sexpistol'
+require 'stringio'
+
+require 'flea/environment'
+require 'flea/interpreter'

metadata

@@ -1,67 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flea
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Aaron Gough
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-
-date: 2011-03-13 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2022-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sexpistol
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
   name: any-spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
   type: :development
-  version_requirements: *id002
-description: Flea is an extremely simple, but extremely extensible Lisp interpreter written in Ruby.
-email: aaron@aarongough.com
-executables: 
-- flea
-- flea
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+description: Flea is an extremely simple, but extremely extensible Lisp interpreter
+  written in Ruby.
+email:
+- aaron@aarongough.com
+executables: []
 extensions: []
-
-extra_rdoc_files: 
-- MIT-LICENSE
-- README.rdoc
-files: 
-- .gitignore
+extra_rdoc_files: []
+files:
+- ".github/workflows/build.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
+- README.md
 - bin/flea
 - examples/guess-the-number.scm
-- flea-language-spec/README.rdoc
+- flea-language-spec/README.md
 - flea-language-spec/flea-language-spec.yaml
 - flea-language-spec/test-cases/01-display-and-basic-literals/01-display-string-literal.scm
 - flea-language-spec/test-cases/01-display-and-basic-literals/02-display-integer-literal.scm
@@ -88,7 +125,7 @@ files:
 - flea-language-spec/test-cases/03-basic-built-in-procedures/07-equal?/06-equal?-false-boolean.scm
 - flea-language-spec/test-cases/03-basic-built-in-procedures/07-equal?/07-equal?-true-list.scm
 - flea-language-spec/test-cases/03-basic-built-in-procedures/07-equal?/08-equal?-false-list.scm
-- flea-language-spec/test-cases/04-comma-quoting/01-comma-quoting.scm
+- flea-language-spec/test-cases/04-quoting/01-quoting.scm
 - flea-language-spec/test-cases/05-lambda/01-lambda.scm
 - flea-language-spec/test-cases/05-lambda/02-call-in-place-lambda.scm
 - flea-language-spec/test-cases/05-lambda/03-define-with-lambda.scm
@@ -110,6 +147,7 @@ files:
 - flea-language-spec/test-cases/09-list-manipulation/04-append.scm
 - flea-language-spec/test-cases/09-list-manipulation/05-list.scm
 - flea-language-spec/test-cases/10-functional-examples/countdown.scm
+- flea.gemspec
 - lib/flea.rb
 - lib/flea/environment.rb
 - lib/flea/interpreter.rb
@@ -138,94 +176,28 @@ files:
 - lib/flea/standard_library/set.scm
 - lib/flea/standard_library/string_to_num.scm
 - lib/flea/standard_library/subtraction_operator.scm
-- spec/flea/environment_spec.rb
-- spec/flea/interpreter_spec.rb
-- spec/flea/standard_library/addition_operator_spec.rb
-- spec/flea/standard_library/append_spec.rb
-- spec/flea/standard_library/begin_spec.rb
-- spec/flea/standard_library/car_spec.rb
-- spec/flea/standard_library/cdr_spec.rb
-- spec/flea/standard_library/cons_spec.rb
-- spec/flea/standard_library/display_spec.rb
-- spec/flea/standard_library/division_operator_spec.rb
-- spec/flea/standard_library/equality_operator_spec.rb
-- spec/flea/standard_library/gets_spec.rb
-- spec/flea/standard_library/greater_than_spec.rb
-- spec/flea/standard_library/if_spec.rb
-- spec/flea/standard_library/lambda_spec.rb
-- spec/flea/standard_library/less_than_spec.rb
-- spec/flea/standard_library/list_predicate_spec.rb
-- spec/flea/standard_library/list_spec.rb
-- spec/flea/standard_library/list_tail_spec.rb
-- spec/flea/standard_library/mutiplication_operator_spec.rb
-- spec/flea/standard_library/null_spec.rb
-- spec/flea/standard_library/quote_spec.rb
-- spec/flea/standard_library/rand_spec.rb
-- spec/flea/standard_library/read_spec.rb
-- spec/flea/standard_library/set_spec.rb
-- spec/flea/standard_library/string_to_num_spec.rb
-- spec/flea/standard_library/subtraction_operator_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/aarongough/flea
-licenses: []
-
-post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-- --line-numbers
-- --inline-source
-require_paths: 
+- lib/flea/version.rb
+homepage: https://github.com/aarongough/flea
+licenses:
+- MIT
+metadata: {}
+post_install_message:
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: 2.5.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.8
+signing_key:
+specification_version: 4
 summary: A tiny but flexible Lisp interpreter written in Ruby
-test_files: 
-- spec/flea/environment_spec.rb
-- spec/flea/interpreter_spec.rb
-- spec/flea/standard_library/addition_operator_spec.rb
-- spec/flea/standard_library/append_spec.rb
-- spec/flea/standard_library/begin_spec.rb
-- spec/flea/standard_library/car_spec.rb
-- spec/flea/standard_library/cdr_spec.rb
-- spec/flea/standard_library/cons_spec.rb
-- spec/flea/standard_library/display_spec.rb
-- spec/flea/standard_library/division_operator_spec.rb
-- spec/flea/standard_library/equality_operator_spec.rb
-- spec/flea/standard_library/gets_spec.rb
-- spec/flea/standard_library/greater_than_spec.rb
-- spec/flea/standard_library/if_spec.rb
-- spec/flea/standard_library/lambda_spec.rb
-- spec/flea/standard_library/less_than_spec.rb
-- spec/flea/standard_library/list_predicate_spec.rb
-- spec/flea/standard_library/list_spec.rb
-- spec/flea/standard_library/list_tail_spec.rb
-- spec/flea/standard_library/mutiplication_operator_spec.rb
-- spec/flea/standard_library/null_spec.rb
-- spec/flea/standard_library/quote_spec.rb
-- spec/flea/standard_library/rand_spec.rb
-- spec/flea/standard_library/read_spec.rb
-- spec/flea/standard_library/set_spec.rb
-- spec/flea/standard_library/string_to_num_spec.rb
-- spec/flea/standard_library/subtraction_operator_spec.rb
-- spec/spec_helper.rb
+test_files: []