p-lang 0.0.2 → 0.0.3

data/README.rdoc

@@ -3,7 +3,7 @@
 P is a small ('pequena' in portuguese) functional programming language.
 
   fib = [1| 1],
-        [2| 2],
+        [2| 1],
         [n| fib(n-1) + fib(n-2)]
   
   fib(10)

data/VERSION.yml

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

data/lib/vm/proc.rb

@@ -13,16 +13,20 @@ class Proc
             return false
           end
         else
-          form[2].each_with_index do |p, i|
-            unless p[0] == :id
-              unless p == obj[2][i]
-                if p[0] == :object
-                  return compare_form(p, obj[2][i])
-                else
-                  return false
+          if form[2].length == obj[2].length
+            form[2].each_with_index do |p, i|
+              unless p[0] == :id
+                unless p == obj[2][i]
+                  if p[0] == :object
+                    return compare_form(p, obj[2][i])
+                  else
+                    return false
+                  end
                 end
               end
             end
+          else
+            return false
           end
         end
       end
@@ -31,11 +35,15 @@ class Proc
   end
 
   def call?(params)
-    params.each_with_index do |param, i|
-      unless compare_form(@form[i], param.form)
-        return false
+    if @form.length == params.length
+      params.each_with_index do |param, i|
+        unless compare_form(@form[i], param.form)
+          return false
+        end
       end
+      return true
+    else
+      return false
     end
-    return true
   end
-end
+end

data/lib/vm/std/io.rb

@@ -10,8 +10,8 @@ module PLang
           puts value.to_s
         end
       end
-      lamb.form = []
+      lamb.form = [nil]
       [lamb]
     end
   end
-end
+end

data/test/test_vm_programs.txt

@@ -34,4 +34,5 @@ begin(1,2,3,4)
 {obj: x} -> f = [x-1] {obj: 1} -> f()
 {obj: 1, 2, 3, x} -> f = [1+2+3+x] {obj: 1, 2, 3, 10}->f()
 f = [_,x,_| x*2] f(1,2,3)
-f = [{obj: {xxx: _}, x}, y| x+y] f({obj: {xxx: 1}, 2}, 3)
+f = [{obj: {xxx: _}, x}, y| x+y] f({obj: {xxx: 1}, 2}, 3)
+list_sum = [{list: head, tail}| head + list_sum(tail)], [{list}| 0] list_sum({list: 1, {list: 2, {list}}})

data/test/test_vm_results.txt

@@ -34,4 +34,5 @@ true
 0
 16
 4
-5
+5
+3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: p-lang
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Igor Bonadio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 -03:00
+date: 2010-07-07 00:00:00 -03:00
 default_executable: p-lang
 dependencies: 
 - !ruby/object:Gem::Dependency