plasma 0.1.0 → 0.1.1

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 
 gemspec = Gem::Specification.new do |s|
   s.name = "plasma"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
   s.author = "Ryan Spangler"
   s.email = "patch_work8848@yahoo.com"
   s.homepage = "http://kaleidomedallion.com/plasma/"

data/bin/plasma

@@ -10,7 +10,11 @@ interpreter = Plasma::Interpreter::PlasmaInterpreter.new
 if ARGV.empty?
   interpreter.repl
 else
-  puts interpreter.merge(ARGV[0])
+  value = ARGV.inject(nil) do |value, arg|
+    interpreter.merge(arg)
+  end
+
+  puts value
 end
 
 

data/lib/plasma/interpreter/plasma_interpreter.rb

@@ -8,7 +8,10 @@ module Plasma
         @comment = /##*[^#]+##*/
 
         @dir = File.dirname(__FILE__)
-        @load_path = [File.join(PLASMA_ROOT, 'include'), PLASMA_PACKAGE_ROOT, @dir]
+        @load_path = [PLASMA_PACKAGE_ROOT, 
+                      File.join(PLASMA_ROOT, 'include'), 
+                      @dir, 
+                      `pwd`.strip]
 
         @env = Env.new
         @env.bind!(:mu, self)
@@ -54,7 +57,7 @@ module Plasma
         found = false
         value = nil
         
-        @load_path.each do |p|
+        @load_path.reverse_each do |p|
           package = File.join(p, file)
           if File.exist? package
             source = File.open(package, 'r')
@@ -62,6 +65,7 @@ module Plasma
 
             value = self.interpret(code)
             found = true
+            break
           end
         end
 

data/test/recur.plasma

@@ -0,0 +1,8 @@
+[(defun (fac n)
+   (if (<= n 1) 
+    then 1
+    else (* n (fac (- n 1)))))]
+
+[(fac 50)]
+
+

data/test/recur.rb

@@ -0,0 +1,6 @@
+def fac(n)
+  return 1 if n <= 1
+  n * fac(n-1)
+end
+
+puts fac(50)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: plasma
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ryan Spangler
@@ -36,6 +36,8 @@ files:
 - test/import_test.plasma
 - test/parse_test.rb
 - test/plasmic.plasma
+- test/recur.plasma
+- test/recur.rb
 - test/template_test.plasma
 - test/template_test.rb
 - lib/extras