p-lang 0.3.0 → 0.3.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 0
+:patch: 1
 :build: 

data/bin/teste.p

@@ -0,0 +1,2 @@
+{a: {list}, x} = {a: '(), 1}
+print(x)

data/lib/vm/environment.rb

@@ -32,7 +32,10 @@ module PLang
         v = get_var(id)
         if v
           if v.id == :lambda and lamb.id == :lambda
-            v.params |= lamb.params
+            while v.params[1].id == :lambda
+              v = v.params[1]
+            end
+            v.params[1] = lamb
           else
             raise "TODO: Environment#add_lambda#2"
           end

data/lib/vm/interpreter.rb

@@ -131,7 +131,9 @@ module PLang
           end
         end
         if next_lambda
-          lambda |= execute(next_lambda, env).params
+          lambda << execute(next_lambda, env)
+        else
+          lambda << PObject.new(:empty, [])
         end
         PObject.new(:lambda, lambda)
       end
@@ -142,8 +144,15 @@ module PLang
           values << execute(param, env)
         end
         lambda = execute(lambda, env)
-        lambda.params.each do |lamb|
-          return lamb.call(values) if lamb.call?(values)
+        #lambda.params.each do |lamb|
+        #  return lamb.call(values) if lamb.call?(values)
+        #end
+        while lambda.id == :lambda
+          if lambda.params[0].call?(values)
+            return lambda.params[0].call(values)
+          else
+            lambda = lambda.params[1]
+          end
         end
         raise "CallError"
       end

data/lib/vm/pfunctions.rb

@@ -40,7 +40,7 @@ module PLang
           obj_params << param
         end
                 
-        PObject.new(:lambda, [lamb])
+        PObject.new(:lambda, [lamb, PObject.new(:empty, [])])
       end
       
       def object(expr)

data/test/test_vm

@@ -27,3 +27,6 @@ x = '(1,2,3,4) x->concat(10)->tail()->head()
 sum = [{empty}| 0]; [x| x->head() + sum(x->tail())] x = '(1,2,3,4) sum(x)
 if(2>=2, 1, 2)
 if(2<2, 1, 2)
+{a: {empty}, x} = {a: '(), 1} x
+{lambda: f, fs} -> one = [1] print->one()
+{lambda: f, fs} -> add_one = [x|1+x] print->add_one(3)

data/test/test_vm_result

@@ -27,3 +27,6 @@
 10
 1
 2
+1
+1
+4

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: p-lang
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Igor Bonadio
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-31 00:00:00 -03:00
-default_executable: p-lang
+date: 2010-10-01 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -36,6 +36,7 @@ description: P is a small ('pequena' in portuguese) functional programming langu
 email: igorbonadio@gmail.com
 executables: 
 - p-lang
+- teste.p
 extensions: []
 
 extra_rdoc_files: 
@@ -79,6 +80,7 @@ files:
 - test/test_vm
 - test/test_vm.rb
 - test/test_vm_result
+- bin/teste.p
 has_rdoc: true
 homepage: http://github.com/igorbonadio/p-lang
 licenses: []