gisele 0.4.0 → 0.5.0

data/lib/gisele/language/processors/if_to_case.rb

@@ -1,28 +1,28 @@
 module Gisele
   module Language
-    class IfToCase < Rewriter
-      alias :on_missing :copy_and_applyall
+    class IfToCase < Sexpr::Rewriter
+      grammar Language
 
-      def on_if_st(node)
-        condition, dost, *clauses = node.children
+      def on_if_st(sexpr)
+        condition, dost, *clauses = sexpr.sexpr_body
 
         # create case_st with same markers as the if_st
-        when_clause = [:when_clause, condition, mainflow.call(dost)]
-        when_clause = node(when_clause, node.markers.dup)
+        when_clause = [:when_clause, condition, apply(dost)]
+        when_clause = sexpr(when_clause, sexpr.tracking_markers)
         base        = [:case_st, nil, when_clause]
-        base        = node(base, node.markers.dup)
+        base        = sexpr(base, sexpr.tracking_markers)
 
         # this is the condition for elsif clauses
         @condition = negate(condition.last)
 
         # make injection now
         clauses.inject base do |memo,clause|
-          memo << call(clause)
+          memo << apply(clause)
         end
       end
 
-      def on_elsif_clause(node)
-        condition, dost, = node.children
+      def on_elsif_clause(sexpr)
+        condition, dost, = sexpr.sexpr_body
 
         # install new conditions for me and next elsif clauses
         condition = condition.last
@@ -33,25 +33,27 @@ module Gisele
         base = \
           [:when_clause,
             [:bool_expr, [:bool_and, condition, previous]],
-            mainflow.call(dost) ]
-        node(base, node.markers.dup)
+            apply(dost) ]
+        sexpr(base, sexpr.tracking_markers)
       end
 
-      def on_else_clause(node)
-        dost, = node.children
+      def on_else_clause(sexpr)
+        dost, = sexpr.sexpr_body
 
         # convert else to when and keep the markers
         base = \
           [:when_clause,
             [:bool_expr, @condition],
-            mainflow.call(dost)]
-        node(base, node.markers.dup)
+            apply(dost)]
+        sexpr(base, sexpr.tracking_markers)
       end
 
+      alias :on_missing :copy_and_apply
+
       private
 
       def negate(cond)
-        if cond.rule_name == :bool_not
+        if cond.first == :bool_not
           cond.last
         else
           [:bool_not, cond]
@@ -60,4 +62,4 @@ module Gisele
 
     end # class IfToCase
   end # module Language
-end # module Gisele
+end # module Gisele

data/lib/gisele/language/processors/scoping_helper.rb

@@ -0,0 +1,32 @@
+module Gisele
+  module Language
+    class ScopingHelper < Sexpr::Processor::Helper
+
+      module Methods
+
+        def scope_stack
+          @scope_stack ||= []
+        end
+
+        def with_scope(scope)
+          scope_stack.push(scope)
+          result = yield
+          scope_stack.pop
+          result
+        end
+
+      end # module Methods
+
+      def on_missing(rw, sexpr)
+        if sexpr.first.to_s =~ /_def/
+          rw.with_scope(sexpr) do
+            yield(rw, sexpr)
+          end
+        else
+          yield(rw, sexpr)
+        end
+      end
+
+    end # module ScopingHelper
+  end # module Language
+end # module Gisele

data/lib/gisele/language/processors/sugar_removal.rb

@@ -1,12 +1,17 @@
 module Gisele
   module Language
-    class SugarRemoval < Rewriter
-      alias :on_missing :copy_and_applyall
+    class SugarRemoval < Sexpr::Rewriter
+      grammar Language
 
-      def on_if_st(node)
-        ElsifFlattener.new(:mainflow => self).call(node)
+      # (elsif ... -> else if ...)
+      use ElsifFlattener
+
+      def apply(sexpr)
+        # all is already done by preprocessors so that we can simply return
+        # the s-expression.
+        sexpr
       end
 
     end # class SugarRemoval
   end # module Language
-end # module Gisele
+end # module Gisele

data/lib/gisele/language/syntax/case_st.rb

@@ -16,4 +16,4 @@ module Gisele
       end # module CaseSt
     end # module Syntax
   end # module Language
-end # module Gisele
+end # module Gisele

data/lib/gisele/language/syntax/node.rb

@@ -4,7 +4,11 @@ module Gisele
       module Node
 
         def to_ast
-          Language::AST.node(_to_ast, {:match => self})
+          Language::sexpr(value, {:citrus_match => self})
+        end
+
+        def value
+          _to_ast
         end
 
       end # module Node
@@ -33,4 +37,4 @@ require_relative 'elsif_clause'
 require_relative 'case_st'
 require_relative 'when_clause'
 require_relative 'task_def'
-require_relative 'unit_def'
+require_relative 'unit_def'

data/lib/gisele/language/syntax/when_clause.rb

@@ -13,4 +13,4 @@ module Gisele
       end # module WhenClause
     end # module Syntax
   end # module Language
-end # module Gisele
+end # module Gisele

data/lib/gisele/loader.rb

@@ -3,4 +3,5 @@ require "epath"
 require "quickl"
 require "awesome_print"
 require "yargi"
-require "sexp_grammar"
+require "sexpr"
+require "stamina-core"

data/lib/gisele/version.rb

@@ -2,7 +2,7 @@ module Gisele
   module Version
 
     MAJOR = 0
-    MINOR = 4
+    MINOR = 5
     TINY  = 0
 
     def self.to_s

data/spec/command/main/gisele_glts.cmd

@@ -0,0 +1 @@
+gisele --glts tasks/complete.gis

data/spec/command/main/gisele_glts.stdout

@@ -0,0 +1,85 @@
+digraph G {
+  graph [rankdir="LR"];
+  0 [color="black" fillcolor="green" shape="circle" style="filled"];
+  2 [color="black" fillcolor="white" shape="circle" style="filled"];
+  4 [color="black" fillcolor="white" shape="circle" style="filled"];
+  6 [color="black" fillcolor="white" shape="circle" style="filled"];
+  5 [color="black" fillcolor="white" shape="circle" style="filled"];
+  7 [color="black" fillcolor="white" shape="circle" style="filled"];
+  9 [color="black" fillcolor="white" shape="circle" style="filled"];
+  10 [color="black" fillcolor="white" shape="circle" style="filled"];
+  21 [color="black" fillcolor="white" shape="circle" style="filled"];
+  18 [color="black" fillcolor="white" shape="circle" style="filled"];
+  23 [color="black" fillcolor="white" shape="circle" style="filled"];
+  20 [color="black" fillcolor="white" shape="circle" style="filled"];
+  12 [color="black" fillcolor="white" shape="circle" style="filled"];
+  22 [color="black" fillcolor="white" shape="circle" style="filled"];
+  14 [color="black" fillcolor="white" shape="circle" style="filled"];
+  19 [color="black" fillcolor="white" shape="circle" style="filled"];
+  8 [color="black" fillcolor="white" shape="circle" style="filled"];
+  13 [color="black" fillcolor="white" shape="circle" style="filled"];
+  15 [color="black" fillcolor="white" shape="circle" style="filled"];
+  24 [color="black" fillcolor="white" shape="circle" style="filled"];
+  17 [color="black" fillcolor="white" shape="circle" style="filled"];
+  26 [color="black" fillcolor="white" shape="circle" style="filled"];
+  16 [color="black" fillcolor="white" shape="circle" style="filled"];
+  25 [color="black" fillcolor="white" shape="circle" style="filled"];
+  27 [color="black" fillcolor="white" shape="circle" style="filled"];
+  3 [color="black" fillcolor="white" shape="circle" style="filled"];
+  29 [color="black" fillcolor="white" shape="circle" style="filled"];
+  11 [color="black" fillcolor="white" shape="circle" style="filled"];
+  36 [color="black" fillcolor="white" shape="circle" style="filled"];
+  1 [color="black" fillcolor="white" shape="circle" style="filled"];
+  30 [color="black" fillcolor="white" shape="circle" style="filled"];
+  33 [color="black" fillcolor="white" shape="circle" style="filled"];
+  32 [color="black" fillcolor="white" shape="circle" style="filled"];
+  38 [color="black" fillcolor="white" shape="circle" style="filled"];
+  35 [color="black" fillcolor="white" shape="circle" style="filled"];
+  34 [color="black" fillcolor="white" shape="circle" style="filled"];
+  37 [color="black" fillcolor="white" shape="circle" style="filled"];
+  31 [color="black" fillcolor="white" shape="circle" style="filled"];
+  28 [color="black" fillcolor="white" shape="circle" style="filled"];
+  4 -> 6 [label="FirstTask:start"];
+  6 -> 5 [label="FirstTask:end"];
+  2 -> 4 [label=""];
+  7 -> 9 [label=""];
+  12 -> 14 [label="MakeJoy:start"];
+  14 -> 13 [label="MakeJoy:end"];
+  10 -> 12 [label=""];
+  15 -> 17 [label="DrinkBeers:start"];
+  17 -> 16 [label="DrinkBeers:end"];
+  13 -> 15 [label=""];
+  16 -> 11 [label=""];
+  9 -> 10 [label="[everyoneHappy]"];
+  11 -> 8 [label=""];
+  18 -> 20 [label="DrinkBeer:start"];
+  20 -> 19 [label="DrinkBeer:end"];
+  9 -> 18 [label="[(someoneHappy and not(everyoneHappy))]"];
+  19 -> 8 [label=""];
+  21 -> 23 [label="DoNothingSpecial:start"];
+  23 -> 22 [label="DoNothingSpecial:end"];
+  9 -> 21 [label="[(not(someoneHappy) and not(everyoneHappy))]"];
+  22 -> 8 [label=""];
+  5 -> 7 [label=""];
+  24 -> 26 [label=""];
+  27 -> 29 [label=""];
+  30 -> 32 [label="DoSomething:start"];
+  32 -> 31 [label="DoSomething:end"];
+  29 -> 30 [label="[somethingToDo]"];
+  31 -> 28 [label=""];
+  33 -> 35 [label="DoNothing:start"];
+  35 -> 34 [label="DoNothing:end"];
+  29 -> 33 [label="[nothingToDo]"];
+  34 -> 28 [label=""];
+  36 -> 38 [label="WaitAndSee:start"];
+  38 -> 37 [label="WaitAndSee:end"];
+  29 -> 36 [label="[(not(someoneHappy) and not(everyoneHappy))]"];
+  37 -> 28 [label=""];
+  26 -> 25 [label="[endOfTheDay]"];
+  26 -> 27 [label="[not(endOfTheDay)]"];
+  28 -> 26 [label=""];
+  8 -> 24 [label=""];
+  25 -> 3 [label=""];
+  0 -> 2 [label=""];
+  3 -> 1 [label=""];
+}

data/spec/command/main/gisele_help.stdout

@@ -6,9 +6,10 @@ SYNOPSIS
   gisele [--ast | --graph] PROCESS_FILE
 
 OPTIONS
-      --ast=[MODE]                 Prints the process abstract syntax tree (debug,ruby)
       --no-sugar                   Apply syntactic sugar removal
-      --graph=[MODE]               Converts and print a graph (dot)
+      --ast=[MODE]                 Compile as an abstract syntax tree (debug,ruby)
+      --graph=[MODE]               Compile as a workflow graph (dot)
+      --glts=[MODE]                Compile as guarded labeled transition system (dot)
       --help                       Show this help message
       --version                    Show version and exit
 

data/spec/spec_helper.rb

@@ -12,10 +12,9 @@ ensure
 end
 
 module SpecHelpers
-  include Gisele::Language::AST::Helpers
 
   def parse(text, rule, consume = true)
-    grammar = Gisele::Language::Syntax::Grammar
+    grammar = Gisele::Language::Grammar
     grammar.parse(text, :root => rule, :consume => consume)
   end
 
@@ -36,7 +35,7 @@ module SpecHelpers
   end
 
   def sexp_grammar
-    Gisele::Language::SEXP_GRAMMAR
+    Gisele::Language
   end
 
   def simple_ast

data/spec/test_examples.rb

@@ -12,11 +12,11 @@ describe "The examples" do
       end
 
       it 'respects the SexpGrammar' do
-        (Gisele::Language::SEXP_GRAMMAR === ast).should be_true
+        (Gisele::Language === ast).should be_true
       end
 
     end
 
   end
 
-end
+end

data/spec/unit/compiling/test_to_glts.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+module Gisele
+  module Compiling
+    describe ToGlts do
+
+      it 'returns an array of Automaton when called on a unit_def' do
+        got = ToGlts.call(complete_ast)
+        got.should be_a(Array)
+        got.all?{|x| x.is_a? Stamina::Automaton}.should be_true
+      end
+
+      it 'returns a Digraph when called on a task_def' do
+        got = ToGlts.call(complete_ast.last)
+        got.should be_a(Stamina::Automaton)
+        got.depth
+      end
+
+    end
+  end
+end

data/spec/unit/compiling/test_to_graph.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+module Gisele
+  module Compiling
+    describe ToGraph do
+
+      it 'returns an array of Digraphs when called on a unit_def' do
+        got = ToGraph.call(complete_ast)
+        got.should be_a(Array)
+        got.all?{|x| x.is_a? Yargi::Digraph}.should be_true
+      end
+
+      it 'returns a Digraph when called on a task_def' do
+        got = ToGraph.call(complete_ast.last)
+        got.should be_a(Yargi::Digraph)
+      end
+
+    end
+  end
+end

data/spec/unit/language/ast/test_bool_expr.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+module Gisele::Language::AST
+  describe BoolExpr, "negate" do
+
+    def sexpr(expr, options = {})
+      Gisele.sexpr(Gisele.parse(expr, options))
+    end
+
+    subject{ sexpr(expr, :root => :bool_expr).negate }
+
+    shared_examples_for 'A negated bool_expr' do
+
+      it 'is consistently rewrited' do
+        (Gisele::Language[:bool_expr] === subject).should be_true
+      end
+
+      it 'is correctly tagged' do
+        subject.should be_a(Sexpr)
+        subject.should be_a(BoolExpr)
+      end
+
+      it 'has no immediate traceability marker' do
+        subject.citrus_match.should be_nil
+      end
+    end
+
+    describe "on a normal expression" do
+      let(:expr){ "x and y" }
+
+      it_behaves_like 'A negated bool_expr'
+
+      it "negates as expected" do
+        expected = sexpr("not(x and y)", :root => :bool_expr)
+        subject.should eq(expected)
+      end
+    end
+
+    describe "on a negated expression" do
+      let(:expr){ "not(x and y)" }
+
+      it_behaves_like 'A negated bool_expr'
+
+      it "removes the negation" do
+        expected = sexpr("x and y", :root => :bool_expr)
+        subject.should eq(expected)
+      end
+    end
+
+  end
+end

data/spec/unit/language/grammar_sexp/test_fluent_def.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 module Gisele::Language
   describe "the Sexp grammar", "fluent_def" do
 
-    let(:g){ SEXP_GRAMMAR }
+    let(:g){ Gisele::Language }
 
     it 'matches an fluent with initial value' do
       fluent = [:fluent_def, "name", [:event_set, "start"], [:event_set, "stop"], true]

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

@@ -3,11 +3,11 @@ module Gisele::Language
   describe ElsifFlattener 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 = ElsifFlattener.new.call(ast)
+      @rewrited = ElsifFlattener.call(ast)
     end
 
     after{
@@ -91,4 +91,4 @@ module Gisele::Language
     end
 
   end
-end
+end