nydp 0.2.2 → 0.2.3

data/lib/lisp/tests/orequal-examples.nydp

@@ -0,0 +1,20 @@
+(examples-for or=
+  ("assign a simple nil variable"
+   (let x nil (or= x 42) x)
+   42)
+
+  ("assign a simple non-nil variable"
+   (let x 99 (or= x 42) x)
+   99)
+
+  ("assign a nil hash value"
+   (let h (hash)
+     (or= h.x 43)
+     h.x)
+   43)
+
+  ("assign a non-nil hash value"
+   (let h { x 999 }
+     (or= h.x 43)
+     h.x)
+   999))

data/lib/nydp.rb

@@ -1,35 +1,9 @@
-module Nydp
-  PLUGINS = []
-
-  def self.plug_in plugin ; PLUGINS << plugin                   ; end
-  def self.load_rake_tasks; PLUGINS.each &:load_rake_tasks      ; end
-  def self.setup ns;        PLUGINS.each { |plg| plg.setup ns } ; end
-  def self.loadfiles;       PLUGINS.map(&:loadfiles).flatten    ; end
-  def self.testfiles;       PLUGINS.map(&:testfiles).flatten    ; end
-  def self.plugin_names   ; PLUGINS.map(&:name)                 ; end
-  def self.loadall ns, plugin, files
-    vm = VM.new(ns)
-    apply_function ns, :"script-run", :"plugin-start", plugin.name if plugin
-    files.each { |f|
-      script_name = f.gsub plugin.base_path, ""
-      reader = Nydp::StreamReader.new(File.new(f))
-      Nydp::Runner.new(vm, ns, reader, nil, (script_name || f)).run
-    }
-  ensure
-    apply_function ns, :"script-run", :"plugin-end", plugin.name if plugin
-  end
+require 'date'
+require 'set'
 
-  def self.build_nydp extra_files=nil
-    ns = { }
-    setup(ns)
-    PLUGINS.each { |plg|
-      loadall ns, plg, plg.loadfiles
-      loadall ns, plg, plg.testfiles
-    }
-    loadall ns, nil, extra_files if extra_files
-    ns
+module Nydp
+  class Namespace < Hash
   end
-
   def self.apply_function ns, function_name, *args
     function = r2n(function_name.to_sym, ns).value
     args     = r2n args, ns
@@ -43,12 +17,21 @@ module Nydp
   def self.eval_src      ns, src_txt, name=nil ; eval_with Nydp::Runner, ns, src_txt, name                  ; end
   def self.eval_src!     ns, src_txt, name=nil ; eval_with Nydp::ExplodeRunner, ns, src_txt, name           ; end
   def self.eval_with runner, ns, src_txt, name ; runner.new(VM.new(ns), ns, reader(src_txt), nil, name).run ; end
+  def self.ms                           t1, t0 ; ((t1 - t0) * 1000).to_i                                    ; end
 
-  def self.repl
+  def self.repl options={ }
+    launch_time = Time.now
+    last_script_time = Time.now
     puts "welcome to nydp"
-    puts "^D to exit"
     reader = Nydp::ReadlineReader.new $stdin, "nydp > "
-    ns     = build_nydp
+    ns     = build_nydp do |script|
+      this_script_time = Time.now
+      puts "script #{script} time #{ms this_script_time, last_script_time}ms" if options[:verbose]
+      last_script_time = this_script_time
+    end
+    load_time = Time.now
+    puts "repl ready in #{ms(load_time, launch_time)}ms"
+    puts "^D to exit"
     Nydp::Runner.new(VM.new(ns), ns, reader, $stdout, "<stdin>").run
   end
 
@@ -59,9 +42,9 @@ module Nydp
     ns     = build_nydp
     Nydp::Runner.new(VM.new(ns), ns, reader, nil, "<test-runner>").run
   end
-
 end
 
+require "nydp/plugin"
 require "nydp/core"
 require "nydp/date"
 require "nydp/runner"

data/lib/nydp/builtin.rb

@@ -1,6 +1,3 @@
-require 'nydp'
-require 'nydp/error'
-
 module Nydp::Builtin
   module Base
     include Nydp::Helper

data/lib/nydp/core.rb

@@ -1,4 +1,4 @@
-require 'nydp'
+require 'nydp/plugin'
 
 module Nydp
   class Core

data/lib/nydp/function_invocation.rb

@@ -86,6 +86,19 @@ module Nydp
     end
 
     # TODO generate various Invocation_XXX classes on-demand instead of hand_coding them all up front
+    class Invocation_LEX < Invocation::Base
+      def initialize expr, src
+        super src
+        @sym = expr.car
+      end
+
+      def execute vm
+        @sym.value(vm.current_context).invoke_1 vm
+      rescue Exception => e
+        handle e, @sym.value(vm.current_context), Nydp::NIL
+      end
+    end
+
     class Invocation_SYM < Invocation::Base
       def initialize expr, src
         super src
@@ -99,6 +112,22 @@ module Nydp
       end
     end
 
+    class Invocation_LEX_LEX < Invocation::Base
+      def initialize expr, src
+        super src
+        @lex0 = expr.car
+        @lex1 = expr.cdr.car
+      end
+
+      def execute vm
+        fn = @lex0.value(vm.current_context)
+        a0 = @lex1.value(vm.current_context)
+        fn.invoke_2 vm, a0
+      rescue Exception => e
+        handle e, fn, cons(a0)
+      end
+    end
+
     class Invocation_SYM_LEX < Invocation::Base
       def initialize expr, src
         super src
@@ -115,6 +144,24 @@ module Nydp
       end
     end
 
+    class Invocation_LEX_LEX_LEX < Invocation::Base
+      def initialize expr, src
+        super src
+        @lex_0 = expr.car
+        @lex_1 = expr.cdr.car
+        @lex_2 = expr.cdr.cdr.car
+      end
+
+      def execute vm
+        fn = @lex_0.value(vm.current_context)
+        a0 = @lex_1.value(vm.current_context)
+        a1 = @lex_2.value(vm.current_context)
+        fn.invoke_3 vm, a0, a1
+      rescue Exception => e
+        handle e, fn, cons(a0, cons(a1))
+      end
+    end
+
     class Invocation_SYM_LEX_LEX < Invocation::Base
       def initialize expr, src
         super src

data/lib/nydp/plugin.rb

@@ -0,0 +1,33 @@
+module Nydp
+  PLUGINS = []
+
+  def self.plug_in plugin ; PLUGINS << plugin                   ; end
+  def self.load_rake_tasks; PLUGINS.each &:load_rake_tasks      ; end
+  def self.setup ns;        PLUGINS.each { |plg| plg.setup ns } ; end
+  def self.loadfiles;       PLUGINS.map(&:loadfiles).flatten    ; end
+  def self.testfiles;       PLUGINS.map(&:testfiles).flatten    ; end
+  def self.plugin_names   ; PLUGINS.map(&:name)                 ; end
+  def self.loadall ns, plugin, files
+    vm = VM.new(ns)
+    apply_function ns, :"script-run", :"plugin-start", plugin.name if plugin
+    files.each { |f|
+      script_name = f.gsub plugin.base_path, ""
+      reader = Nydp::StreamReader.new(File.new(f))
+      Nydp::Runner.new(vm, ns, reader, nil, (script_name || f)).run
+      yield script_name if block_given?
+    }
+  ensure
+    apply_function ns, :"script-run", :"plugin-end", plugin.name if plugin
+  end
+
+  def self.build_nydp extra_files=nil, &block
+    ns = Namespace.new
+    setup(ns)
+    PLUGINS.each { |plg|
+      loadall ns, plg, plg.loadfiles, &block
+      loadall ns, plg, plg.testfiles, &block
+    }
+    loadall ns, nil, extra_files, &block if extra_files
+    ns
+  end
+end

data/lib/nydp/symbol.rb

@@ -4,9 +4,9 @@ class Nydp::Symbol
   attr_reader   :hash
 
   def initialize name
+    name = name.to_s
     @name = name.to_sym
-    @inspection = name.to_s
-    @inspection = "|#{name}|" if untidy(@inspection)
+    @inspection = "|#{name}|" if untidy(name)
     @hash       = name.hash
   end
 
@@ -34,12 +34,12 @@ class Nydp::Symbol
 
   def self.find name, ns ; ns[name.to_sym] ;  end
 
-  def nydp_type  ; :symbol        ; end
-  def inspect    ; @inspection    ; end
-  def to_s       ; name.to_s      ; end
-  def to_sym     ; name           ; end
-  def to_ruby    ; to_sym         ; end
-  def eql? other ; self == other  ; end
+  def nydp_type  ; :symbol                  ; end
+  def inspect    ; @inspection || name.to_s ; end
+  def to_s       ; name.to_s                ; end
+  def to_sym     ; name                     ; end
+  def to_ruby    ; to_sym                   ; end
+  def eql? other ; self == other            ; end
   def is? nm     ; self.name == nm.to_sym   ; end
   def > other    ; self.name > other.name   ; end
   def < other    ; self.name < other.name   ; end

data/lib/nydp/tokeniser.rb

@@ -2,12 +2,24 @@ require "strscan"
 
 module Nydp
   class Tokeniser
+    BACKSLASH = /\\/.freeze
+    COMMENT   = /;.*$/.freeze
+    QUOTE     = /"/.freeze
+    PIPE      = /\|/.freeze
+    LIST_PFX  = /[^\s()]*\(/.freeze
+    BRACE_PFX = /[^\s()\}\{]*\{/.freeze
+    RPAREN    = /\)/.freeze
+    RBRACE    = /\}/.freeze
+    FLOAT     = /[-+]?[0-9]*\.[0-9]+([eE][-+]?[0-9]+)?/.freeze
+    INTEGER   = /[-+]?[0-9]+/.freeze
+    ATOM_PIPE = /[^\s()"{}\|]+\|/.freeze
+    ATOM      = /[^\s()"{}\|]+/.freeze
+
     attr_accessor :state, :finished
 
     def initialize reader
       @reader = reader
       @scanner = StringScanner.new("")
-      @state = :lisp
     end
 
     def no_more?
@@ -30,7 +42,7 @@ module Nydp
       rep = open_delimiter.to_s
       string = ""
       while (!no_more?)
-        if esc = s.scan(/\\/)
+        if esc = s.scan(BACKSLASH)
           rep    << esc
           ch = s.getch
           case ch
@@ -76,29 +88,29 @@ module Nydp
         if no_more?
           @finished = true
           return nil
-        elsif comment = s.scan(/;.*$/)
+        elsif comment = s.scan(COMMENT)
           tok = [:comment, comment[1..-1].strip]
-        elsif open_str = s.scan(/"/)
+        elsif open_str = s.scan(QUOTE)
           tok = [:string_open_delim, open_str]
-        elsif open_sym = s.scan(/\|/)
+        elsif open_sym = s.scan(PIPE)
           tok = [:sym_open_delim, open_sym]
-        elsif list_prefix = s.scan(/[^\s()]*\(/)
+        elsif list_prefix = s.scan(LIST_PFX)
           tok = [:left_paren, list_prefix[0...-1]]
-        elsif list_prefix = s.scan(/[^\s()\}\{]*\{/)
+        elsif list_prefix = s.scan(BRACE_PFX)
           tok = [:left_brace, list_prefix[0...-1]]
-        elsif s.scan(/\)/)
+        elsif s.scan(RPAREN)
           tok = [:right_paren]
-        elsif s.scan(/\}/)
+        elsif s.scan(RBRACE)
           tok = [:right_brace]
-        elsif number = s.scan(/[-+]?[0-9]*\.[0-9]+([eE][-+]?[0-9]+)?/)
+        elsif number = s.scan(FLOAT)
           tok = [:number, number.to_f]
-        elsif integer = s.scan(/[-+]?[0-9]+/)
+        elsif integer = s.scan(INTEGER)
           tok = [:number, integer.to_i]
-        elsif atom = s.scan(/[^\s()"{}\|]+\|/)
+        elsif atom = s.scan(ATOM_PIPE)
           atom = atom[0...-1]
-          rest = next_string_fragment("|", /\|/, nil) || Nydp::StringFragmentToken.new("", "")
+          rest = next_string_fragment("|", PIPE, nil) || Nydp::StringFragmentToken.new("", "")
           tok = [:symbol, "#{atom}#{rest.string}"]
-        elsif atom = s.scan(/[^\s()"{}\|]+/)
+        elsif atom = s.scan(ATOM)
           tok = [:symbol, atom]
         else
           s.getch

data/lib/nydp/version.rb

@@ -1,3 +1,3 @@
 module Nydp
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/nydp/vm.rb

@@ -14,6 +14,10 @@ module Nydp
       @ns           = ns
     end
 
+    def r2n obj
+      super obj, self.ns
+    end
+
     def thread expr=nil
       instructions.push expr if expr
       while instructions.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nydp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,12 @@ files:
 - lib/lisp/core-017-builtin-dox.nydp
 - lib/lisp/core-020-utils.nydp
 - lib/lisp/core-030-syntax.nydp
+- lib/lisp/core-035-flow-control.nydp
+- lib/lisp/core-037-list-utils.nydp
 - lib/lisp/core-040-utils.nydp
+- lib/lisp/core-041-string-utils.nydp
+- lib/lisp/core-042-date-utils.nydp
+- lib/lisp/core-043-list-utils.nydp
 - lib/lisp/core-045-dox-utils.nydp
 - lib/lisp/core-050-test-runner.nydp
 - lib/lisp/core-060-benchmarking.nydp
@@ -130,6 +135,7 @@ files:
 - lib/lisp/tests/len-examples.nydp
 - lib/lisp/tests/list-tests.nydp
 - lib/lisp/tests/mapsum-examples.nydp
+- lib/lisp/tests/orequal-examples.nydp
 - lib/lisp/tests/parser-tests.nydp
 - lib/lisp/tests/plus-plus-examples.nydp
 - lib/lisp/tests/pre-compile-examples.nydp
@@ -206,6 +212,7 @@ files:
 - lib/nydp/literal.rb
 - lib/nydp/pair.rb
 - lib/nydp/parser.rb
+- lib/nydp/plugin.rb
 - lib/nydp/readline_history.rb
 - lib/nydp/runner.rb
 - lib/nydp/string_atom.rb