electr 0.0.5 → 0.0.6

data/spec/parser/sya_spec.rb

@@ -68,6 +68,36 @@ describe Sya do
     expect(sya.run).to eq [added, a, b]
   end
 
+  specify 'R1 R2' do
+    a = LexicalUnit.variable('R1')
+    b = LexicalUnit.variable('R2')
+    added = LexicalUnit.operator('*')
+    sya = Sya.new([a, b])
+
+    # * R1 R2
+    expect(sya.run).to eq [added, a, b]
+  end
+
+  specify 'R1 5' do
+    a = LexicalUnit.variable('R1')
+    b = LexicalUnit.numeric('5')
+    added = LexicalUnit.operator('*')
+    sya = Sya.new([a, b])
+
+    # * R1 5
+    expect(sya.run).to eq [added, a, b]
+  end
+
+  specify '5 R1' do
+    a = LexicalUnit.numeric('5')
+    b = LexicalUnit.variable('R1')
+    added = LexicalUnit.operator('*')
+    sya = Sya.new([a, b])
+
+    # * R1 5
+    expect(sya.run).to eq [added, a, b]
+  end
+
   specify 'sqrt(49) + 1' do
     a = LexicalUnit.fname('sqrt')
     b = LexicalUnit.open_parenthesis
@@ -185,4 +215,38 @@ describe Sya do
     expect(sya.run).to eq [f, a, b, d, g]
   end
 
+  specify "R1 = 100" do
+    a = LexicalUnit.variable("R1")
+    b = LexicalUnit.assign
+    c = LexicalUnit.numeric("100")
+
+    sya = Sya.new([a, b, c])
+
+    expect(sya.run).to eq [b, a, c]
+  end
+
+  specify "R1 = 200 + 100" do
+    a = LexicalUnit.variable("R1")
+    b = LexicalUnit.assign
+    c = LexicalUnit.numeric("200")
+    d = LexicalUnit.operator("+")
+    e = LexicalUnit.numeric("100")
+
+    sya = Sya.new([a, b, c, d, e])
+
+    expect(sya.run).to eq [b, a, d, c, e]
+  end
+
+  specify "R1 = R2 = 100" do
+    a = LexicalUnit.variable("R1")
+    b = LexicalUnit.assign
+    c = LexicalUnit.variable("R2")
+    d = LexicalUnit.assign
+    e = LexicalUnit.numeric("100")
+
+    sya = Sya.new([a, b, c, d, e])
+
+    expect(sya.run).to eq [b, a, d, c, e]
+  end
+
 end

data/spec/parser/tokenizer_spec.rb

@@ -207,6 +207,19 @@ describe Tokenizer do
     expect(tkr.next_token).to eq "2"
   end
 
+  specify "R1" do
+    tkr = Tokenizer.new("R1")
+    expect(tkr.next_token).to eq "R1"
+  end
+
+  specify "R1 = 100" do
+    tkr = Tokenizer.new("R1 = 100")
+
+    expect(tkr.next_token).to eq "R1"
+    expect(tkr.next_token).to eq "="
+    expect(tkr.next_token).to eq "100"
+  end
+
   it 'tokenize units and prefixes' do
     units = %w( A Hz W C V F R Ω S ℧ H )
     prefixes = %w( k M G T m μ u n p )

data/spec/repl/electr_value_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+
+include Electr
+
+describe ElectrValue do
+
+  describe "number" do
+
+    it "holds a number" do
+      result = ElectrValue.number(10)
+      expect(result.number).to eq 10
+    end
+
+    it "has type number" do
+      result = ElectrValue.number(10)
+      expect(result.type).to eq :number
+    end
+
+    it "knows it is a number" do
+      result = ElectrValue.number(10)
+      expect(result.number?).to eq true
+      expect(result.error?).to eq false
+    end
+  end
+
+  describe "error" do
+
+    it "holds an error message" do
+      result = ElectrValue.error("message")
+      expect(result.error).to eq "message"
+    end
+
+    it "has type error" do
+      result = ElectrValue.error("message")
+      expect(result.type).to eq :error
+    end
+
+    it "knows it is a error" do
+      result = ElectrValue.error("message")
+      expect(result.error?).to eq true
+      expect(result.number?).to eq false
+    end
+  end
+
+  describe "hidden" do
+
+    it "holds a hidden number" do
+      result = ElectrValue.hidden(10)
+      expect(result.number).to eq 10
+    end
+
+    it "has type hidden" do
+      result = ElectrValue.hidden(10)
+      expect(result.type).to eq :hidden
+    end
+
+    it "knows it is a hidden number" do
+      result = ElectrValue.hidden(10)
+      expect(result.number?).to eq false
+      expect(result.hidden?).to eq true
+    end
+  end
+
+  describe "==" do
+    it "is equal when all same members" do
+      a = ElectrValue.number(10)
+      b = ElectrValue.number(10)
+      expect(a.object_id).not_to eq b.object_id
+      expect(a).to eq b
+    end
+
+    it "isn't equal when different types" do
+      a = ElectrValue.number(10)
+      b = ElectrValue.error("foo")
+      expect(a).not_to eq b
+    end
+
+    it "isn't equal when different classes" do
+      a = ElectrValue.number(10)
+      b = 10
+      expect(a).not_to eq b
+    end
+
+  end
+
+end

data/spec/repl/evaluator_spec.rb

@@ -45,19 +45,128 @@ describe Evaluator do
       evaluator = Evaluator.new
       result = evaluator.evaluate_pn(pns)
 
-      expect(result).to eq code[:result]
+      expect(result).to eq ElectrValue.number(code[:result])
     end
   end
 
   specify do
     pns = Compiler.compile_to_pn("2 * 3")
-    
+
     evaluator = Evaluator.new
     result = evaluator.evaluate_pn(pns)
 
-    expect(result).to eq 6
+    expect(result).to eq ElectrValue.number(6.0)
   end
 
+  describe "environment" do
+
+    it "don't raise on unbound variable" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1")
+      expect {
+        evaluator.evaluate_pn(pns)
+      }.not_to raise_error
+    end
+
+    it "evalutes an assignment" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = 100")
+      result = evaluator.evaluate_pn(pns)
+
+      expect(result).to eq ElectrValue.hidden(100.0)
+    end
+
+    it "does chain assignment" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = R2 = 100")
+      evaluator.evaluate_pn(pns)
+
+      expect(evaluator.environment["R1"]).to eq ElectrValue.number(100.0)
+      expect(evaluator.environment["R2"]).to eq ElectrValue.number(100.0)
+    end
+
+    it "retains variable" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = 100")
+      evaluator.evaluate_pn(pns)
+      expect(evaluator.environment["R1"]).to eq ElectrValue.number(100.0)
+    end
+
+    it "starts empty" do
+      evaluator = Evaluator.new
+      expect(evaluator.environment).to be_empty
+    end
+
+    it "assigns an expression" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R2 = 10 + 7")
+      evaluator.evaluate_pn(pns)
+      expect(evaluator.environment["R2"]).to eq ElectrValue.number(17.0)
+    end
+
+    it "assigns a variable's value" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = 100")
+      evaluator.evaluate_pn(pns)
+
+      pns = Compiler.compile_to_pn("R2 = R1")
+      evaluator.evaluate_pn(pns)
+      expect(evaluator.environment["R2"]).to eq ElectrValue.number(100.0)
+    end
+
+    it "gets the value" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = 100")
+      evaluator.evaluate_pn(pns)
+
+      pns = Compiler.compile_to_pn("R1")
+      result = evaluator.evaluate_pn(pns)
+      expect(result).to eq ElectrValue.number(100.0)
 
+    end
+
+    it "can add two variables" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = 100")
+      evaluator.evaluate_pn(pns)
+
+      pns = Compiler.compile_to_pn("R2 = 200")
+      evaluator.evaluate_pn(pns)
+
+      pns = Compiler.compile_to_pn("R1 + R2")
+      result = evaluator.evaluate_pn(pns)
+      expect(result).to eq ElectrValue.number(300.0)
+    end
+
+    it "can add a variable and a numeric" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = 100")
+      evaluator.evaluate_pn(pns)
+
+      pns = Compiler.compile_to_pn("R1 + 50")
+      result = evaluator.evaluate_pn(pns)
+      expect(result).to eq ElectrValue.number(150.0)
+    end
+
+    it "can add a numeric and a variable" do
+      evaluator = Evaluator.new
+
+      pns = Compiler.compile_to_pn("R1 = 100")
+      evaluator.evaluate_pn(pns)
+
+      pns = Compiler.compile_to_pn("50 + R1")
+      result = evaluator.evaluate_pn(pns)
+      expect(result).to eq ElectrValue.number(150.0)
+    end
+  end
 
 end

data/spec/repl/printer_spec.rb

@@ -6,12 +6,52 @@ describe Printer do
 
   describe ".run" do
 
+    it 'accepts ElectrValue objects' do
+      expect {
+
+        Printer.run(ElectrValue.number(10.0))
+
+      }.not_to raise_error
+    end
+
+    it 'accepts only ElectrValue objects' do
+      expect {
+
+        Printer.run(10.0)
+
+      }.to raise_error
+    end
+
     it 'truncates integer like number' do
-      expect { Printer.run(10.0) }.to output("10\n").to_stdout
+      expect {
+
+        Printer.run(ElectrValue.number(10.0))
+
+      }.to output("10\n").to_stdout
     end
 
     it 'rounds number' do
-      expect { Printer.run(1.0 / 3) }.to output("0.3333333333\n").to_stdout
+      expect {
+
+        Printer.run(ElectrValue.number(1.0 / 3))
+
+      }.to output("0.3333333333\n").to_stdout
+    end
+
+    it 'display the error message if any' do
+      expect {
+
+        Printer.run(ElectrValue.error("foo"))
+
+      }.to output("foo\n").to_stdout
+    end
+
+    it "doesn't display a hidden value" do
+      expect {
+
+        Printer.run(ElectrValue.hidden(10))
+
+      }.to_not output.to_stdout
     end
 
   end

data/spec/repl/repl_spec.rb

@@ -24,7 +24,7 @@ describe Repl do
 
     it 'runs the toolchain' do
       repl = Repl.new(TestReader.new, Evaluator.new, TestPrinter)
-      expect(repl.run_once).to eq 3
+      expect(repl.run_once).to eq ElectrValue.number(3)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: electr
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - lkdjiin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,9 +84,6 @@ files:
 - README.md
 - Rakefile
 - bin/electr
-- documentation/developer.md
-- documentation/grammar.md
-- documentation/precedence.md
 - electr.gemspec
 - lib/electr.rb
 - lib/electr/ast.rb
@@ -99,6 +96,7 @@ files:
 - lib/electr/ast/operator_ast.rb
 - lib/electr/ast/root_ast.rb
 - lib/electr/ast/value_ast.rb
+- lib/electr/ast/variable_ast.rb
 - lib/electr/compiler.rb
 - lib/electr/exceptions.rb
 - lib/electr/option.rb
@@ -118,6 +116,7 @@ files:
 - lib/electr/repl/ast_printer.rb
 - lib/electr/repl/ast_reader.rb
 - lib/electr/repl/base_reader.rb
+- lib/electr/repl/electr_value.rb
 - lib/electr/repl/eval_function.rb
 - lib/electr/repl/evaluator.rb
 - lib/electr/repl/nil_evaluator.rb
@@ -136,6 +135,7 @@ files:
 - spec/parser/value_spec.rb
 - spec/repl/ast_printer_spec.rb
 - spec/repl/ast_reader_spec.rb
+- spec/repl/electr_value_spec.rb
 - spec/repl/evaluator_spec.rb
 - spec/repl/nil_evaluator_spec.rb
 - spec/repl/printer_spec.rb
@@ -165,7 +165,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Interactive language for electronic formulas
+summary: Interactive tiny language for electronic formulas
 test_files:
 - spec/ast/ast_spec.rb
 - spec/compiler_spec.rb
@@ -178,6 +178,7 @@ test_files:
 - spec/parser/value_spec.rb
 - spec/repl/ast_printer_spec.rb
 - spec/repl/ast_reader_spec.rb
+- spec/repl/electr_value_spec.rb
 - spec/repl/evaluator_spec.rb
 - spec/repl/nil_evaluator_spec.rb
 - spec/repl/printer_spec.rb

data/documentation/developer.md

@@ -1,21 +0,0 @@
-The parsing process
-===================
-
-The aim of the parsing process it to transform a source code into an AST.
-
-AST: [Abstract Syntax Tree][AST]
-
-SYA: [Shunting Yard Algorithm][SYA]
-
-PN: [Prefix Notation][PN]
-
-This is the stages of the parser:
-
-1. Tokenizer
-2. Lexer
-3. Syntaxer
-4. AST (using SYA for formulas)
-
-[AST]: https://en.wikipedia.org/wiki/Abstract_syntax_tree
-[SYA]: https://en.wikipedia.org/wiki/Shunting-yard_algorithm
-[PN]: https://en.wikipedia.org/wiki/Polish_notation