p-lang 0.2.0 → 0.3.0

data/README.rdoc

@@ -75,7 +75,11 @@ IO:
 
 == Running
 
-  $ p-lang -i your-program.p
+  $ p-lang your-program.p
+
+== Interactive P Shell
+
+  $ p-lang
 
 == Note on Patches/Pull Requests
  

data/VERSION.yml

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

data/bin/p-lang

@@ -14,7 +14,12 @@ options = OptionParser.new do|opts|
     vm.execute!
   end
 
-  opts.on("-i", "-i FILE", "interp a script file.") do |file|
+  opts.on("-i", "-i", "interactive p shell.") do
+    shell = PLang::IPS::Shell.new
+    shell.start
+  end
+
+  opts.on("-f", "-f FILE", "interp a script file.") do |file|
     begin
       program = File.readlines(file).join("")
     rescue
@@ -35,10 +40,11 @@ argv = ARGV
 begin
   if ARGV.length > 0
     if options.parse!(ARGV).length > 0
-      options.parse!(["-h"])
+      options.parse!(["-f" + ARGV[0]])
     end
   else
-    options.parse!(["-h"])
+    # without arguments
+    options.parse!(["-i"])
   end
 rescue
   puts "p-lang: unrecognized option"

data/lib/ips/shell.rb

@@ -0,0 +1,59 @@
+module PLang
+  module IPS # = Interactive P Shell
+    class Shell
+      def initialize
+        @expr_c = ""
+        @interpreter = PLang::VM::Interpreter.new(nil)
+        @env = @interpreter.send(:load_basic_environment)
+      end
+
+      def start
+        while true
+          begin
+            execute(read)
+          rescue Exception => e
+            if e.class == SystemExit
+              raise e
+            else
+              puts "ips:#{e}"
+            end
+          end
+        end
+      end
+
+      def execute(expr)
+        expr = @expr_c + expr
+        sa = PLang::Parser::SyntaxAnalyser.new(expr)
+        begin
+          ast = sa.parse
+          result = nil
+          ast.each do |a|
+            result = @interpreter.send(:execute, a, @env)
+          end
+          @expr_c = ""
+          show(result)
+        rescue Exception => e
+          if e.message =~ /sintax error: unexpected '\\n'/
+            @expr_c = expr
+          else
+            @expr_c = ""
+            raise e
+          end
+        end
+      end
+
+      def show(out)
+        puts " => #{out.to_s}"
+      end
+
+      def read
+        if @expr_c == ""
+          print "p-lang > "
+        else
+          print "...... > "
+        end
+        gets
+      end
+    end
+  end
+end

data/lib/p-lang.rb

@@ -19,3 +19,6 @@ require File.join(ROOT_PATH, '/vm/core/pstring')
 require File.join(ROOT_PATH, '/vm/core/pchar')
 require File.join(ROOT_PATH, '/vm/core/plist')
 require File.join(ROOT_PATH, '/vm/core/pio')
+require File.join(ROOT_PATH, '/vm/core/miscellaneous')
+
+require File.join(ROOT_PATH, '/ips/shell.rb')

data/lib/vm/core/miscellaneous.rb

@@ -0,0 +1,11 @@
+module PLang
+  module VM
+    module PFunctions
+      def add_to_interpreter_miscellaneous_functions
+        def_function :exit, do
+          exit
+        end
+      end
+    end
+  end
+end

data/lib/vm/core/pboolean.rb

@@ -3,19 +3,19 @@ module PLang
     module PFunctions
       def add_to_interpreter_boolean_functions
         
-        object_message "{boolean: x}", :_and do |object|
+        def_object_message "{boolean: x}", :_and do |object|
           plambda "{boolean: y}" do |value|
             PObject.new(:boolean, [(object.params[0] and value[0].params[0])])
           end
         end
         
-        object_message "{boolean: x}", :_or do |object|
+        def_object_message "{boolean: x}", :_or do |object|
           plambda "{boolean: y}" do |value|
             PObject.new(:boolean, [(object.params[0] or value[0].params[0])])
           end
         end
         
-        object_message "{boolean: x}", :_not do |object|
+        def_object_message "{boolean: x}", :_not do |object|
           plambda do
             PObject.new(:boolean, [(not object.params[0])])
           end
@@ -24,4 +24,4 @@ module PLang
       end
     end
   end
-end
+end

data/lib/vm/core/pchar.rb

@@ -2,7 +2,7 @@ module PLang
   module VM
     module PFunctions
       def add_to_interpreter_char_functions
-        object_message "{char: x}", :ord do |object|
+        def_object_message "{char: x}", :ord do |object|
           plambda do |value|
             PObject.new(:integer, [object.params[0].ord])
           end
@@ -10,4 +10,4 @@ module PLang
       end
     end
   end
-end
+end

data/lib/vm/core/pdecimal.rb

@@ -3,7 +3,7 @@ module PLang
     module PFunctions
       def add_to_interpreter_decimal_functions
         
-        object_message "{decimal: x}", :add do |object|
+        def_object_message "{decimal: x}", :add do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -14,7 +14,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :sub do |object|
+        def_object_message "{decimal: x}", :sub do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -25,7 +25,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :mul do |object|
+        def_object_message "{decimal: x}", :mul do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -36,7 +36,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :div do |object|
+        def_object_message "{decimal: x}", :div do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -47,7 +47,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :mod do |object|
+        def_object_message "{decimal: x}", :mod do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -58,7 +58,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :major do |object|
+        def_object_message "{decimal: x}", :major do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -69,7 +69,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :major_equal do |object|
+        def_object_message "{decimal: x}", :major_equal do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -80,7 +80,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :minor do |object|
+        def_object_message "{decimal: x}", :minor do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -91,7 +91,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :minor_equal do |object|
+        def_object_message "{decimal: x}", :minor_equal do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -102,7 +102,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :equal do |object|
+        def_object_message "{decimal: x}", :equal do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -113,7 +113,7 @@ module PLang
           end
         end
         
-        object_message "{decimal: x}", :diff do |object|
+        def_object_message "{decimal: x}", :diff do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -127,4 +127,4 @@ module PLang
       end
     end
   end
-end
+end

data/lib/vm/core/pinteger.rb

@@ -3,7 +3,7 @@ module PLang
     module PFunctions
       def add_to_interpreter_integer_functions
         
-        object_message "{integer: x}", :add do |object|
+        def_object_message "{integer: x}", :add do |object|
           plambda "y" do |value|
             if value[0].id == :integer
               PObject.new(:integer, [object.params[0] + value[0].params[0]])
@@ -13,7 +13,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :sub do |object|
+        def_object_message "{integer: x}", :sub do |object|
           plambda "y" do |value|
             if value[0].id == :integer
               PObject.new(:integer, [object.params[0] - value[0].params[0]])
@@ -23,7 +23,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :mul do |object|
+        def_object_message "{integer: x}", :mul do |object|
           plambda "y" do |value|
             if value[0].id == :integer
               PObject.new(:integer, [object.params[0] * value[0].params[0]])
@@ -33,7 +33,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :div do |object|
+        def_object_message "{integer: x}", :div do |object|
           plambda "y" do |value|
             if value[0].id == :integer
               PObject.new(:integer, [object.params[0] / value[0].params[0]])
@@ -43,7 +43,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :mod do |object|
+        def_object_message "{integer: x}", :mod do |object|
           plambda "y" do |value|
             if value[0].id == :integer
               PObject.new(:integer, [object.params[0] % value[0].params[0]])
@@ -53,7 +53,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :major do |object|
+        def_object_message "{integer: x}", :major do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -64,7 +64,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :major_equal do |object|
+        def_object_message "{integer: x}", :major_equal do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -75,7 +75,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :minor do |object|
+        def_object_message "{integer: x}", :minor do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -86,7 +86,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :minor_equal do |object|
+        def_object_message "{integer: x}", :minor_equal do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -97,7 +97,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :equal do |object|
+        def_object_message "{integer: x}", :equal do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -108,7 +108,7 @@ module PLang
           end
         end
         
-        object_message "{integer: x}", :diff do |object|
+        def_object_message "{integer: x}", :diff do |object|
           plambda "y" do |value|
             case value[0].id
               when :integer, :decimal
@@ -122,4 +122,4 @@ module PLang
       end
     end
   end
-end
+end

data/lib/vm/core/pio.rb

@@ -3,13 +3,13 @@ module PLang
     module PFunctions
       def add_to_interpreter_io_functions
         
-        var :print, (plambda "x" do |params|
+        def_function :print, "x" do |params|
           puts params[0].to_s
-        end)
+        end
 
-        var :read, (plambda do
+        def_function :read, do
           PObject.new(:string, [STDIN.gets])
-        end)
+        end
       end
     end
   end

data/lib/vm/core/plist.rb

@@ -3,25 +3,25 @@ module PLang
     module PFunctions
       def add_to_interpreter_list_functions
 
-        object_message "{list: x, xs}", :head do |object|
+        def_object_message "{list: x, xs}", :head do |object|
           plambda do |value|
             object.params[0]
           end
         end
 
-        object_message "{list: x, xs}", :tail do |object|
+        def_object_message "{list: x, xs}", :tail do |object|
           plambda do |value|
             object.params[1]
           end
         end
 
-        object_message "{list: x, xs}", :concat do |object|
+        def_object_message "{list: x, xs}", :concat do |object|
           plambda "x" do |value|
             PObject.new(:list, [value[0], object])
           end
         end
 
-        object_message "{empty}", :concat do |object|
+        def_object_message "{empty}", :concat do |object|
           plambda "x" do |value|
             PObject.new(:list, [value[0], object])
           end

data/lib/vm/core/pstring.rb

@@ -3,31 +3,31 @@ module PLang
     module PFunctions
       def add_to_interpreter_string_functions
         
-        object_message "{string: x}", :at do |object|
+        def_object_message "{string: x}", :at do |object|
           plambda "{integer: y}" do |value|
             PObject.new(:char, [object.params[0][value[0].params[0]]])
           end
         end
         
-        object_message "{string: x}", :concat do |object|
+        def_object_message "{string: x}", :concat do |object|
           plambda "{string: y}" do |value|
             PObject.new(:string, [object.params[0] + value[0].params[0]])
           end
         end
         
-        object_message "x", :to_string do |object|
+        def_object_message "x", :to_string do |object|
           plambda do |value|
             PObject.new(:string, [object.to_s])
           end
         end
 
-        object_message "{string: x}", :to_integer do |object|
+        def_object_message "{string: x}", :to_integer do |object|
           plambda do |value|
             PObject.new(:integer, [object.params[0].to_i])
           end
         end
 
-        object_message "{string: x}", :to_decimal do |object|
+        def_object_message "{string: x}", :to_decimal do |object|
           plambda do |value|
             PObject.new(:decimal, [object.params[0].to_f])
           end

data/lib/vm/pfunctions.rb

@@ -1,7 +1,28 @@
 module PLang
   module VM
     module PFunctions
+
+      def def_function(id, *params)
+        def_var(id, (plambda(*params) do |values|
+          yield(values)
+        end))
+      end
+
+      def def_object_message(object, message)
+        lamb = plambda(object, "{#{message.to_s}}") do |values|
+          yield(values[0], values[1])
+        end
+        begin
+          @env.set_var(:get_object_message, lamb)
+        rescue
+          @env.add_lambda(:get_object_message, lamb)
+        end
+      end
       
+      def def_var(id, value)
+        @env.set_var(id.to_sym, value)
+      end      
+
       def plambda(*params)
         lamb = PLambda.new do |values|
           yield(values)
@@ -22,25 +43,10 @@ module PLang
         PObject.new(:lambda, [lamb])
       end
       
-      def object_message(object, message)
-        lamb = plambda(object, "{#{message.to_s}}") do |values|
-          yield(values[0], values[1])
-        end
-        begin
-          @env.set_var(:get_object_message, lamb)
-        rescue
-          @env.add_lambda(:get_object_message, lamb)
-        end
-      end
-      
-      def var(id, value)
-        @env.set_var(id.to_sym, value)
-      end
-      
       def object(expr)
         PLang::Parser::SyntaxAnalyser.new(expr).parse[0]
       end
       
     end
   end
-end
+end

data/lib/vm/pobject.rb

@@ -12,7 +12,7 @@ module PLang
       def to_s
         case @id
           when :integer, :decimal, :char, :string, :boolean
-            return params[0]
+            return params[0].to_s
           when :empty
             return "'()"
           when :list

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: p-lang
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Igor Bonadio
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -03:00
+date: 2010-07-31 00:00:00 -03:00
 default_executable: p-lang
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,12 +49,14 @@ files:
 - Rakefile
 - VERSION.yml
 - bin/p-lang
+- lib/ips/shell.rb
 - lib/p-lang.rb
 - lib/parser/error.rb
 - lib/parser/lexer.rb
 - lib/parser/node.rb
 - lib/parser/syntax_analyser.rb
 - lib/parser/token.rb
+- lib/vm/core/miscellaneous.rb
 - lib/vm/core/pboolean.rb
 - lib/vm/core/pchar.rb
 - lib/vm/core/pdecimal.rb