lucio 0.0.7 → 0.0.8

data/Gemfile

@@ -1,17 +1,12 @@
 source "http://rubygems.org"
 
-gem 'polyglot'
-gem 'treetop'
-
-gem 'simplecov', '>= 0.4.0', :require => false, :group => :test
+gem 'sparse', '~> 0.0.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
   gem 'rspec'
-  gem 'ZenTest'
-  gem 'diff-lcs'
-  gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
+  gem "bundler", "~> 1.0.0", :require => false
+  gem "jeweler", "~> 1.6.4", :require => false
+  gem 'simplecov', '~> 0.4.0', :require => false
 end

data/Gemfile.lock

@@ -1,14 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.5.0)
     diff-lcs (1.1.2)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    polyglot (0.3.1)
     rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -21,21 +19,15 @@ GEM
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    yard (0.6.8)
+    sparse (0.0.3)
 
 PLATFORMS
   ruby
   x86-mingw32
 
 DEPENDENCIES
-  ZenTest
   bundler (~> 1.0.0)
-  diff-lcs
   jeweler (~> 1.6.4)
-  polyglot
   rspec
-  simplecov (>= 0.4.0)
-  treetop
-  yard (~> 0.6.0)
+  simplecov (~> 0.4.0)
+  sparse (~> 0.0.3)

data/README.md

@@ -17,19 +17,19 @@ Lucio is developed in my almost nonexistent spare time as a way to keep me learn
 I'm just an ordinary software developer, passionate and curious. If you want to collaborate, fork this and start to code. Simple.
 
 ## Small sample
-    (/ (* (+ 1 2) (+3 4)) 2)
+    (/ (* (+ 1 2) (+ 3 4)) 2)
     => 10.5
 
     (eql? (* (+ 1 2) 3) 9)
     => true
 
-    (if (eql? 10.5 (/ (* (+ 1 2) (+3 4)) 2))
+    (if (eql? 10.5 (/ (* (+ 1 2) (+ 3 4)) 2))
       ("great"))
     => "great"
 
-    (if (eql? 0 (/ (* (+ 1 2) (+3 4)) 2))
+    (if (eql? 0 (/ (* (+ 1 2) (+ 3 4)) 2))
       ("great")
-      ("ouch")
+      ("ouch"))
     => "ouch"
 
 # Lucio (pt\_BR)
@@ -51,17 +51,17 @@ Lucio está sendo desenvolvido em meu quase inexistente tempo livre como uma for
 Sou apenas um rapaz latino-americano sem dinheiro no bolso nem amigos importantes, mas que realmente adora o que faz e muito curioso. Se você quiser participar e colaborar, crie um fork e comece a codificar. Simples assim.
 
 ## Exemplos simples
-    (/ (* (+ 1 2) (+3 4)) 2)
+    (/ (* (+ 1 2) (+ 3 4)) 2)
     => 10.5
 
     (eql? (* (+ 1 2) 3) 9)
     => true
 
-    (if (eql? 10.5 (/ (* (+ 1 2) (+3 4)) 2))
+    (if (eql? 10.5 (/ (* (+ 1 2) (+ 3 4)) 2))
       ("great"))
     => "great"
 
-    (if (eql? 0 (/ (* (+ 1 2) (+3 4)) 2))
+    (if (eql? 0 (/ (* (+ 1 2) (+ 3 4)) 2))
       ("great")
-      ("ouch")
-    => "ouch"
+      ("ouch"))
+    => "ouch"

data/Rakefile

@@ -37,6 +37,3 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 task :default => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/lucio

@@ -3,7 +3,7 @@
 if ARGV.empty?
   $LOAD_PATH << (File.expand_path(File.dirname(__FILE__)) + '/../bin')
   require('repl')
-  Lucio::Repl.run
+  Repl.run
 else
   puts 'meh'
 end

data/bin/repl.rb

@@ -6,34 +6,32 @@ require 'lucio'
 
 QUIT = '.q'
 
-module Lucio
-  class Repl
-    def self.run
-exit = false
-
-puts <<lisp
+class Repl
+  def self.run
+    @lucio = Lucio.new
+    exit = false
+    puts <<lisp
 # lucio interactive console
 -------------------------
 # type a lucio expression and press ENTER
 # type .q and press ENTER to exit
 
 lisp
-while !exit
-  print 'lucio: '
-  command = (gets).chomp
-  exit = (command == QUIT)
-  unless exit
-    begin
-      print '=> '
-      p Lucio.eval(command)
-    rescue Exception => msg
-      puts "Error: #{msg}"
+    while !exit
+      print 'lucio: '
+      command = (gets).chomp
+      exit = (command == QUIT)
+      unless exit
+        begin
+          print '=> '
+          p @lucio.eval(command)
+        rescue Exception => msg
+          puts "Error: #{msg}"
+        end
+        puts ''
+      end
     end
-    puts ''
-  end
-end
 
-puts '# bye!'
-    end
+    puts '# bye!'
   end
 end

data/lib/lucio.rb

@@ -1 +1,3 @@
+require 'sparse'
+require 'lucio/lexicon'
 require 'lucio/lucio'

data/lib/lucio/lexicon.rb

@@ -1,25 +1,17 @@
-require 'lucio/operators'
+class Lexicon
+  def initialize
+    @operator_list = {}
+  end
 
-module Lucio
-  class Lexicon
-    def initialize
-      fill_operator_list
-    end
+  def add_function(token, code)
+    @operator_list[token] = {:type => :function, :code => code}
+  end
 
-    def get(operator)
-      ret = @operator_list[operator]
-    end
+  def add_macro(token, code)
+    @operator_list[token] = {:type => :macro, :code => code}
+  end
 
-    private
-    def fill_operator_list
-      @operator_list = {}
-      @operator_list['+']     = Operator::Sum.new
-      @operator_list['*']     = Operator::Multiplication.new
-      @operator_list['/']     = Operator::Division.new
-      @operator_list['-']     = Operator::Subtraction.new
-      @operator_list['eql?']  = Operator::Equality.new
-      @operator_list['if']    = Operator::Conditional.new
-      @operator_list['let']   = Operator::Attribution.new
-    end
+  def get(operator)
+    @operator_list[operator]
   end
 end

data/lib/lucio/lucio.rb

@@ -1,29 +1,59 @@
-require 'lucio/runner'
-require 'lucio/lexicon'
-require 'lucio/list'
-require 'polyglot'
-require 'treetop'
-require 'lucio_syntax'
+class Lucio
+  def initialize(lexicon = Lexicon.new)
+    @lexicon = lexicon
+    @lexicon.add_function :+    , lambda{|items| items.reduce(0, :+)}
+    @lexicon.add_function :*    , lambda{|items| items.reduce(1, :*)}
+    @lexicon.add_function :-    , lambda{|items| case when items.size == 0; 0; else; head, tail = Lucio.behead(items); tail.empty? ? (head * -1) : tail.inject(head) {|subtraction, item| subtraction -= item}; end}
+    @lexicon.add_function :/    , lambda{|items| case when items.size == 0; raise 'expects at least 1 arguments, given 0'; when items.size == 1; 1.0 / items[0]; else items.reduce{|result, item| result = result / item.to_f}; end}
+    @lexicon.add_function :true , lambda{ true }
+    @lexicon.add_function :false, lambda{ false }
+    @lexicon.add_function :eql? , lambda{|items| items.map{|item| item == items[0]}.reduce{|memo, item| memo && item}}
+    @lexicon.add_macro    :let  , lambda{|lexicon, items| lexicon.add_function(items[0].to_sym, lambda{(items[1].kind_of? Array) ? evaluate_tree(items[1]) : items[1]})}
+    @lexicon.add_macro    :if   , lambda{|lexicon, items| evaluate_tree(items[0]) ? evaluate_tree(items[1]) : evaluate_tree(items[2]) }
+  end
 
-module Lucio
-  def self.parse(str, debug = false)
-    parser = LucioParser.new
-    result = parser.parse str
+  def eval(source_code)
+    tree = Sparse.new.parse(source_code)
+    ret = nil
+    tree.each {|list| ret = evaluate_tree list}
+    ret
+  end
 
-    puts "\n#{parser.failure_reason}" unless result || !debug
+  private
+  def evaluate_tree(tree)
+    unless tree.empty?
+      operator, list = Lucio.behead tree
+      
+      if operator.kind_of?(Symbol) || operator.kind_of?(Array)
+        instruction = @lexicon.get operator
 
-    result
-  end
+        if instruction
+          if instruction[:type] == :function
+            list.map! {|item| (item.kind_of? Array) ? item = evaluate_tree(item) : item}
+            list.map! {|item| (item.kind_of? Symbol) ? item = @lexicon.get(item)[:code].call : item}
 
-  def self.eval(str)
-    parse(str).eval
-  end
+            instruction[:code].call list
+
+            elsif instruction[:type] == :macro
+            instruction[:code].call @lexicon, list
 
-  def self.literal(str)
-    Lucio.eval(str).to_s
+          end
+
+        else
+          raise UnboundSymbolException.new "Unbound symbol #{operator.to_s}"
+
+        end
+      else
+        operator
+      end
+
+    end
   end
 
   def self.behead(list)
     [list[0], list.drop(1)]
   end
 end
+
+class UnboundSymbolException < Exception
+end

data/lucio.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lucio}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pbalduino"]
-  s.date = %q{2011-07-15}
+  s.date = %q{2011-07-19}
   s.description = %q{Lucio is intended to be a Lisp-like language developed in Ruby only for knowledge and fun.}
   s.email = %q{pbalduino+github@gmail.com}
   s.executables = ["lucio", "repl.rb"]
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".autotest",
     ".document",
     ".rspec",
     ".rvmrc",
@@ -29,38 +28,23 @@ Gem::Specification.new do |s|
     "LICENSE.txt",
     "README.md",
     "Rakefile",
-    "TODO.md",
     "VERSION",
     "bin/lucio",
     "bin/repl.rb",
     "lib/lucio.rb",
-    "lib/lucio/grammar.rb",
     "lib/lucio/lexicon.rb",
-    "lib/lucio/list.rb",
     "lib/lucio/lucio.rb",
-    "lib/lucio/operators.rb",
-    "lib/lucio/operators/attribution.rb",
-    "lib/lucio/operators/conditional.rb",
-    "lib/lucio/operators/division.rb",
-    "lib/lucio/operators/equality.rb",
-    "lib/lucio/operators/macro.rb",
-    "lib/lucio/operators/multiplication.rb",
-    "lib/lucio/operators/operator.rb",
-    "lib/lucio/operators/subtraction.rb",
-    "lib/lucio/operators/sum.rb",
-    "lib/lucio/runner.rb",
-    "lib/lucio_syntax.treetop",
     "lucio.gemspec",
-    "spec/all_the_fun_spec.rb",
-    "spec/division_spec.rb",
-    "spec/eval_spec.rb",
-    "spec/lucio_spec.rb",
-    "spec/multiplication_spec.rb",
-    "spec/parser_spec.rb",
+    "spec/add_spec.rb",
+    "spec/behead_spec.rb",
+    "spec/divide_spec.rb",
+    "spec/empty_list_spec.rb",
+    "spec/internal_spec.rb",
+    "spec/let_spec.rb",
+    "spec/minus_spec.rb",
+    "spec/readme_examples_spec.rb",
     "spec/spec_helper.rb",
-    "spec/subtraction_spec.rb",
-    "spec/sum_spec.rb",
-    "spec/variable_spec.rb"
+    "spec/times_spec.rb"
   ]
   s.homepage = %q{https://github.com/pbalduino/lucio}
   s.licenses = ["MIT"]
@@ -72,33 +56,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<polyglot>, [">= 0"])
-      s.add_runtime_dependency(%q<treetop>, [">= 0"])
+      s.add_runtime_dependency(%q<sparse>, ["~> 0.0.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<ZenTest>, [">= 0"])
-      s.add_development_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0.4.0"])
     else
-      s.add_dependency(%q<polyglot>, [">= 0"])
-      s.add_dependency(%q<treetop>, [">= 0"])
+      s.add_dependency(%q<sparse>, ["~> 0.0.3"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<ZenTest>, [">= 0"])
-      s.add_dependency(%q<diff-lcs>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<simplecov>, ["~> 0.4.0"])
     end
   else
-    s.add_dependency(%q<polyglot>, [">= 0"])
-    s.add_dependency(%q<treetop>, [">= 0"])
+    s.add_dependency(%q<sparse>, ["~> 0.0.3"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<ZenTest>, [">= 0"])
-    s.add_dependency(%q<diff-lcs>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<simplecov>, ["~> 0.4.0"])
   end
 end
 

data/spec/add_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Lucio do
+  context 'add' do
+    before :each do
+      @lucio = Lucio.new
+    end
+
+    it 'without parameters should return zero' do
+      @lucio.eval('(+)').should == 0
+    end
+
+    it 'with one value should return that value' do
+      @lucio.eval('(+ 3)').should == 3
+    end
+
+    it 'with two values should return the sum' do
+      @lucio.eval('(+ 3 5)').should == 8
+    end
+
+    it 'with nested lists should eval the list before return the sum' do
+      @lucio.eval('(+ 3 (+ 3 2))').should == 8
+    end
+
+    it 'with neeeeeeesteeeeeeeed freeeeezy!' do
+      @lucio.eval('(+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 (+ 3 2))))))))))))))').should == 44
+    end
+
+    it 'with invalid operator should raise error' do
+      lambda {@lucio.eval('((+ 3 4))')}.should raise_error UnboundSymbolException
+    end
+
+  end
+end