gisele 0.4.0 → 0.5.0

data/spec/unit/language/processors/test_if_to_case.rb

@@ -3,11 +3,11 @@ module Gisele::Language
   describe IfToCase do
 
     def ast(source)
-      Syntax.ast(source.strip, :root => :if_st)
+      Gisele.ast(Gisele.parse(source.strip, :root => :if_st))
     end
 
     def rewrite(ast)
-      @rewrited = IfToCase.new.call(ast)
+      @rewrited = IfToCase.call(ast)
     end
 
     after{
@@ -90,16 +90,16 @@ module Gisele::Language
     it 'keeps traceability markers on a single if' do
       if_st = ast("if goodCond Task1 end")
       rw_st = rewrite(if_st)
-      rw_st.markers.should eq(if_st.markers)
-      rw_st.last.markers.should eq(if_st.markers)
+      rw_st.tracking_markers.should eq(if_st.tracking_markers)
+      rw_st.last.tracking_markers.should eq(if_st.tracking_markers)
     end
 
     it 'keeps traceability markers when a else if present' do
       if_st = ast("if goodCond Task1 else Task2 end")
       rw_st = rewrite(if_st)
-      rw_st.markers.should eq(if_st.markers)
-      rw_st.last.markers.should eq(if_st.last.markers)
+      rw_st.tracking_markers.should eq(if_st.tracking_markers)
+      rw_st.last.tracking_markers.should eq(if_st.last.tracking_markers)
     end
 
   end
-end
+end

data/spec/unit/language/processors/test_scoping_helper.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+module Gisele::Language
+  describe ScopingHelper do
+
+    let(:rw_class) do
+      Class.new(Sexpr::Rewriter) do
+        grammar Gisele::Language
+        helper ScopingHelper
+
+        def on_hello(node)
+          scope_stack.dup
+        end
+
+        def on_missing(node)
+          call(node.sexpr_body.last)
+        end
+
+      end
+    end
+    let(:rw){ rw_class.new }
+
+    it 'installs the methods on the rewriter' do
+      rw.respond_to?(:scope_stack).should be_true
+    end
+
+    it 'does nothing special on non _def nodes' do
+      node = [:hello, "world"]
+      rw.call(node).should eq([])
+    end
+
+    it 'keeps _def nodes as successive scopes' do
+      second = [:task_def, [:hello]]
+      first  = [:task_def, second]
+      rw.call(first).should eq([first, second])
+    end
+
+    it 'pops scopes when returning along the stack' do
+      second = [:task_def, [:hello]]
+      first  = [:task_def, second]
+      rw.call(first)
+      rw.scope_stack.should eq([])
+    end
+
+  end
+end

data/spec/unit/language/syntax/grammar/test_bool_expr.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'bool_expr' do
 
     it 'parses single variable references' do
@@ -31,4 +31,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_boolean_literal.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'boolean_literal' do
 
     it 'parses booleans' do
@@ -14,4 +14,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_case_st.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'case_st' do
 
     it 'supports a single when clause' do
@@ -57,4 +57,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_event.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'event' do
 
     it 'parses correct events' do
@@ -15,4 +15,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_event_name.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'event_name' do
 
     it 'parses correct event names' do
@@ -18,4 +18,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_event_set.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'event_set' do
 
     it 'parses empty sets' do
@@ -23,5 +23,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
-
+end

data/spec/unit/language/syntax/grammar/test_fluent_def.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'fluent_def' do
 
     it 'parses valid fluent definitions' do
@@ -18,4 +18,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_if_st.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'if_st' do
 
     it 'parses a single if statement' do
@@ -18,4 +18,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_par_st.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'par_st' do
 
     it 'parses a single parallel statement' do
@@ -8,4 +8,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_process_statement.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'process_statement' do
 
     it 'parses a simple process statement' do
@@ -16,4 +16,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_seq_st.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'seq_st' do
 
     it 'parses a single sequence statement' do
@@ -8,4 +8,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_spaces.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'spaces' do
 
     it 'parses all kind of spaces' do
@@ -16,4 +16,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_spacing.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'spacing' do
 
     it 'parses all kind of spaces' do
@@ -14,5 +14,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
-
+end

data/spec/unit/language/syntax/grammar/test_task_def.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'task_def' do
 
     it 'parses a simple implicit task definition' do
@@ -32,4 +32,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_task_name.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar,'task_name' do
 
     it 'parses correct task names' do
@@ -16,4 +16,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_task_start_or_end.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'task_start_or_end' do
 
     it 'parses correct event names' do
@@ -14,4 +14,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_trackvar_def.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'trackvar_def' do
 
     it 'parses valid tracking variable definitions' do
@@ -18,4 +18,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_unit_def.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'unit' do
 
     it 'parses a single task definition' do
@@ -26,4 +26,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_variable_name.rb

@@ -1,7 +1,28 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'variable_name' do
 
+    RESERVED_WORDS = [
+      "if",
+      "else",
+      "elsif",
+      "when",
+      "while",
+      "seq",
+      "par",
+      "task",
+      "refinement",
+      "fluent",
+      "trackvar",
+      "initially",
+      "end",
+      "not",
+      "or",
+      "and",
+      "true",
+      "false"
+    ]
+
     it 'parses correct variable names' do
       parse('a',         :variable_name).should eq('a')
       parse('diagnosis', :variable_name).should eq('diagnosis')
@@ -9,7 +30,7 @@ module Gisele::Language::Syntax
     end
 
     it 'does not allow reserved words' do
-      Gisele::Language::RESERVED_WORDS.each do |word|
+      RESERVED_WORDS.each do |word|
         lambda{
           parse(word.to_s + " ", :variable_name)
         }.should raise_error(Citrus::ParseError)
@@ -27,4 +48,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_when_clause.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'when_clause' do
 
     it 'parses a single when clause statement' do
@@ -18,4 +18,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/grammar/test_while_st.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module Gisele::Language::Syntax
+module Gisele::Language
   describe Grammar, 'while_st' do
 
     it 'parses a single while statement' do
@@ -8,4 +8,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/to_ast/test_bool_expr.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 module Gisele::Language::Syntax
   describe BoolExpr, "to_ast" do
 
+    it 'is correctly extended by Sexpr' do
+      ast("true", :bool_expr).should be_a(Gisele::Language::AST::BoolExpr)
+    end
+
     it 'returns expected ast on simple expressions' do
       expected = \
         [:bool_expr, [:bool_and, [:var_ref, "diagKnown"], [:var_ref, "platLow"]]]
@@ -25,4 +29,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/to_ast/test_case_st.rb

@@ -44,4 +44,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/to_ast/test_else_clause.rb

@@ -10,4 +10,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/to_ast/test_elsif_clause.rb

@@ -12,4 +12,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/to_ast/test_event_set.rb

@@ -21,4 +21,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end

data/spec/unit/language/syntax/to_ast/test_fluent_def.rb

@@ -23,4 +23,4 @@ module Gisele::Language::Syntax
     end
 
   end
-end
+end