p-lang 0.0.3 → 0.0.4

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "igorbonadio@gmail.com"
     gem.homepage = "http://github.com/igorbonadio/p-lang"
     gem.authors = ["Igor Bonadio"]
-    gem.add_development_dependency "treetop", ">= 0"
+    gem.add_dependency "treetop", ">= 0"
     gem.add_development_dependency "shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION.yml

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

data/bin/p-lang

@@ -5,9 +5,12 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '/../lib/p-lang')
 if ARGV[0]
   @parser = PLangParser.new
   
-  ast = @parser.parse(File.readlines(ARGV[0]).join("")).build.collect(&:to_sexp)
-  
-  vm = PLang::VM.new(ast)
-  
-  vm.execute!
-end
+  ast = @parser.parse(File.readlines(ARGV[0]).join(""))
+
+  if ast
+    vm = PLang::VM.new(ast.build.collect(&:to_sexp))
+    vm.execute!
+  else
+    puts @parser.failure_reason
+  end
+end

data/bin/teste.p

@@ -0,0 +1,5 @@
+f = [x| x(1)]
+
+g = [x| x+1]
+
+print(f(g))

data/lib/p-lang.rb

@@ -12,6 +12,7 @@ require File.join(ROOT_PATH, '/vm/environment')
 require File.join(ROOT_PATH, '/vm/vm')
 require File.join(ROOT_PATH, '/vm/proc')
 require File.join(ROOT_PATH, '/vm/pobject')
+require File.join(ROOT_PATH, '/vm/perror')
 
 require File.join(ROOT_PATH, '/vm/std/io')
 

data/lib/vm/environment.rb

@@ -12,7 +12,7 @@ module PLang
       unless @vars[id]
         @vars[id] = value
       else
-        raise "add_var"
+        PError.raise_error(:BindVariableError, "variable '#{id}'")
       end
     end
 
@@ -23,7 +23,7 @@ module PLang
       elsif @parent
         return @parent.get_var(id)
       else
-        raise "get_var"
+        PError.raise_error(:NameError, "undefined variable '#{id}'")
       end
     end
         
@@ -44,7 +44,7 @@ module PLang
         end
         return lamb
       rescue
-        raise "get_object_call"
+        PError.raise_error(:ObjectCallError, "undefined message #{object} -> #{msg}")
       end
     end
   end

data/lib/vm/perror.rb

@@ -0,0 +1,8 @@
+module PLang
+  class PError    
+    def PError.raise_error(error_name, error_message)
+      puts error_name.to_s + ": " + error_message
+      exit
+    end
+  end
+end

data/lib/vm/proc.rb

@@ -1,7 +1,5 @@
 class Proc
-  def form=(form)
-    @form = form
-  end
+  attr_accessor :form
   
   def compare_form(form, obj)
     if(form)
@@ -37,8 +35,14 @@ class Proc
   def call?(params)
     if @form.length == params.length
       params.each_with_index do |param, i|
-        unless compare_form(@form[i], param.form)
-          return false
+        unless param.class == Array
+          unless compare_form(@form[i], param.form)
+            return false
+          end
+        else
+          if @form[i]
+            return false
+          end
         end
       end
       return true

data/lib/vm/vm.rb

@@ -85,12 +85,12 @@ module PLang
               add_object_var(param, value.params[i], env)
             else
               unless execute(param, env) == value.params[i]
-                raise "add_object_var #1"
+                PError.raise_error(:ObjectPatternError, "in object '#{obj[1]}'")
               end
           end
         end
       else
-        raise "add_object_var #2"
+        PError.raise_error(:ObjectTypeError, "'#{obj[1]}' expected but was '#{value.type}'")
       end
     end
     
@@ -137,12 +137,26 @@ module PLang
       params.each do |param|
         values << execute(param, env)
       end
-      execute(id, env).each do |lambda|
+      lamb = execute(id, env)
+      lamb.each do |lambda|
         if lambda.call?(values)
           return lambda.call(values)
         end
       end
-      raise "execute_call"
+      # CallFunctionError
+      str_value = "("
+      values.each do |v|
+        str_value += "#{v.to_s}" + ","
+      end
+      if str_value[-1] == ","
+        str_value[-1] = ")"
+      else
+        str_value += ")"
+      end
+      if id[0] == :object_call
+        id = id[2]
+      end
+      PError.raise_error(:CallFunctionError, "in function '#{id[1]}': no pattern matches with #{id[1]}#{str_value}")
     end
 
     def execute_id(id, env)

data/test/test_vm_programs.txt

@@ -36,3 +36,4 @@ begin(1,2,3,4)
 f = [_,x,_| x*2] f(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}}})
+f = [x| x(10)] g = [x| x+1] f(g)

data/test/test_vm_results.txt

@@ -36,3 +36,4 @@ true
 4
 5
 3
+11

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: p-lang
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Igor Bonadio
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -03:00
-default_executable: p-lang
+date: 2010-07-08 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
@@ -30,7 +30,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -50,6 +50,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: 
@@ -68,6 +69,7 @@ files:
 - lib/parser/nodes.rb
 - lib/parser/p-lang.treetop
 - lib/vm/environment.rb
+- lib/vm/perror.rb
 - lib/vm/pobject.rb
 - lib/vm/proc.rb
 - lib/vm/std/io.rb
@@ -79,6 +81,7 @@ files:
 - test/test_vm.rb
 - test/test_vm_programs.txt
 - test/test_vm_results.txt
+- bin/teste.p
 has_rdoc: true
 homepage: http://github.com/igorbonadio/p-lang
 licenses: []