gisele 0.3.0 → 0.4.0

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.4.0 / 2012-02-20
+
+* Major enhancement
+
+  * The grammar is going to be stable very soon now (expect backward compatible additions,
+    maybe). As an helper to work with the grammar, a YAML file describing the structure of
+    the AST can be found in lib/gisele/language/grammar.sexp.yml
+
+* Breaking changes
+
+  * The :nop statement has been renamed :nop_st.
+  * The kind of the AST nodes for fluent and tracking variable definitions have been renamed
+    :fluent_def and :trackvar_def. This is actually a bugfix but that might break other code
+    relying on 0.3.0.
+
 # 0.3.0 / 2012-02-20
 
 * Major enhancements
@@ -24,7 +39,7 @@
     task_refinement and task_signature have been removed as well. The AST signature of a task
     definition is now as follows:
 
-        [:task_def, "TaskName", (fluent_def, trackvar_def, task_def)*, explicit_statement]
+            [:task_def, "TaskName", (fluent_def, trackvar_def, task_def)*, explicit_statement]
 
 # 0.2.0 / 2012-02-17
 
@@ -65,20 +80,20 @@
 
   * The following syntax nodes have been renamed:
 
-        :varref     -> :var_ref
-        :or         -> :bool_or
-        :and        -> :bool_and
-        :not        -> :bool_not
-        :if         -> :if_st
-        :else       -> :else_clause
-        :elsif      -> :elsif_clause
-        :while      -> :while_st
-        :seq        -> :seq_st
-        :par        -> :par_st
-        :task_call  -> :task_call_st
-        :task       -> :task_def
-        :signature  -> :task_signature
-        :refinement -> :task_refinement
+            :varref     -> :var_ref
+            :or         -> :bool_or
+            :and        -> :bool_and
+            :not        -> :bool_not
+            :if         -> :if_st
+            :else       -> :else_clause
+            :elsif      -> :elsif_clause
+            :while      -> :while_st
+            :seq        -> :seq_st
+            :par        -> :par_st
+            :task_call  -> :task_call_st
+            :task       -> :task_def
+            :signature  -> :task_signature
+            :refinement -> :task_refinement
 
 # 0.0.1 / 2012-02-16
 

data/Gemfile

@@ -6,6 +6,7 @@ group :runtime do
   gem "quickl", "~> 0.4.3"
   gem "awesome_print", "~> 1.0"
   gem "yargi", "~> 0.2.0"
+  gem "sexp_grammar", "~> 0.1.0"
 end
 
 group :development do

data/Gemfile.lock

@@ -15,6 +15,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    sexp_grammar (0.1.0)
     wlang (0.10.2)
     yargi (0.2.0)
 
@@ -30,5 +31,6 @@ DEPENDENCIES
   quickl (~> 0.4.3)
   rake (~> 0.9.2)
   rspec (~> 2.8.0)
+  sexp_grammar (~> 0.1.0)
   wlang (~> 0.10.2)
   yargi (~> 0.2.0)

data/gisele.gemspec

@@ -132,6 +132,7 @@ Gem::Specification.new do |s|
   s.add_dependency("quickl", "~> 0.4.3")
   s.add_dependency("awesome_print", "~> 1.0")
   s.add_dependency("yargi", "~> 0.2.0")
+  s.add_dependency("sexp_grammar", "~> 0.1.0")
 
   # The version of ruby required by this gem
   #

data/gisele.noespec

@@ -12,7 +12,7 @@ variables:
   upper:
     Gisele
   version:
-    0.3.0
+    0.4.0
   summary: |-
     Gisele is a Process Analyzer Toolset
   description: |-
@@ -30,6 +30,7 @@ variables:
     - {name: quickl,        version: "~> 0.4.3",  groups: [runtime]}
     - {name: awesome_print, version: "~> 1.0",    groups: [runtime]}
     - {name: yargi,         version: "~> 0.2.0",  groups: [runtime]}
+    - {name: sexp_grammar,  version: "~> 0.1.0",  groups: [runtime]}
     #
     - {name: rake,      version: "~> 0.9.2",  groups: [development]}
     - {name: bundler,   version: "~> 1.0",    groups: [development]}

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

@@ -73,6 +73,11 @@ module Gisele
           attrs.merge(:label => label)
         end
 
+        # Checks validity over the definition
+        def ===(sexp)
+          SEXP_GRAMMAR[rule_name] === sexp
+        end
+
       end # module Node
     end # module AST
   end # module Language

data/lib/gisele/language/grammar.sexp.yml

@@ -0,0 +1,80 @@
+### units and tasks
+unit_def:
+  - [task_def+]
+task_def:
+  - [task_name, some_def*, statement]
+some_def:
+  - fluent_def
+  - trackvar_def
+  - task_def
+### variables
+fluent_def:
+  - [var_name, event_set, event_set, initially]
+trackvar_def:
+  - [var_name, event_set, event_set, initially]
+event_set:
+  - [event*]
+event:
+  - event_name
+  - task_event_name
+var_ref:
+  - [var_name]
+### statements
+statement:
+  - if_st
+  - case_st
+  - while_st
+  - seq_st
+  - par_st
+  - task_call_st
+  - nop_st
+if_st:
+  - [bool_expr, statement, elsif_clause*, "else_clause?"]
+case_st:
+  - [[var_ref, ~], when_clause+, "else_clause?"]
+while_st:
+  - [bool_expr, statement]
+seq_st:
+  - [statement+]
+par_st:
+  - [statement+]
+task_call_st:
+  - [task_name]
+nop_st:
+  - []
+### clauses
+elsif_clause:
+  - [bool_expr, statement]
+else_clause:
+  - [statement]
+when_clause:
+  - [bool_expr, statement]
+### boolean expressions
+bool_expr:
+  - [bool_expression]
+bool_expression:
+  - bool_or
+  - bool_and
+  - bool_not
+  - var_ref
+  - bool_lit
+bool_or:
+  - [bool_expression, bool_expression]
+bool_and:
+  - [bool_expression, bool_expression]
+bool_not:
+  - [bool_expression]
+bool_lit:
+  - [ boolean_literal  ]
+boolean_literal:
+  - true
+  - false
+### terminals
+task_name:       !ruby/regexp /^[A-Z][A-Za-z0-9_]*$/
+var_name:        !ruby/regexp /^[a-z][A-Za-z0-9_]*$/
+event_name:      !ruby/regexp /^[a-z][a-z0-9_]*$/
+task_event_name: !ruby/regexp /^[A-Z][A-Za-z0-9_]*:(start|end)$/
+initially:
+  - true
+  - false
+  - ~

data/lib/gisele/language/processors.rb

@@ -0,0 +1,4 @@
+require_relative 'processors/elsif_flattener'
+require_relative 'processors/if_to_case'
+require_relative 'processors/sugar_removal'
+require_relative 'processors/to_graph'

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

@@ -9,7 +9,7 @@ module Gisele
           init, term = captures[:event_set].map{|x| x.to_ast}
           initval    = captures[:initially_def].first
           initval    = (initval && !initval.empty?) ? initval.value : nil
-          [:fluent, name, init, term, initval]
+          [:fluent_def, name, init, term, initval]
         end
 
       end # module FluentDef

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

@@ -8,7 +8,7 @@ module Gisele
           name  = captures[:task_name].first.strip
           defs  = captures[:some_def].map{|x| x.to_ast}
           ref   = captures[:explicit_statement].map{|x| x.to_ast}.first
-          ref   = [:nop] unless ref
+          ref   = [:nop_st] unless ref
           [:task_def, name] + defs + [ref]
         end
 

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

@@ -10,7 +10,7 @@ module Gisele
           term       = [:event_set] unless term
           initval    = captures[:initially_def].first
           initval    = (initval && !initval.empty?) ? initval.value : nil
-          [:trackvar, name, init, term, initval]
+          [:trackvar_def, name, init, term, initval]
         end
 
       end # module TrackvarDef

data/lib/gisele/language/syntax.rb

@@ -2,7 +2,7 @@ require_relative 'syntax/node'
 module Gisele
   module Language
     module Syntax
-      Citrus.load(File.expand_path('../syntax/grammar', __FILE__))
+      Citrus.load(File.expand_path('../grammar', __FILE__))
 
       def parse(input, options = {})
         source = parsing_source(input)

data/lib/gisele/language.rb

@@ -2,7 +2,8 @@ module Gisele
   module Language
 
     require 'yaml'
-    DOT_ATTRIBUTES = YAML.load_file(Path.dir/"language/dot.yml")
+    DOT_ATTRIBUTES = YAML.load_file(Path.dir/"language/grammar.dot.yml")
+    SEXP_GRAMMAR   = SexpGrammar.load Path.dir/"language/grammar.sexp.yml"
 
     RESERVED_WORDS = [
       "if",
@@ -41,7 +42,4 @@ end # module Gisele
 require_relative 'language/syntax'
 require_relative 'language/ast'
 require_relative 'language/rewriter'
-require_relative 'language/elsif_flattener'
-require_relative 'language/if_to_case'
-require_relative 'language/sugar_removal'
-require_relative 'language/to_graph'
+require_relative 'language/processors'

data/lib/gisele/loader.rb

@@ -3,3 +3,4 @@ require "epath"
 require "quickl"
 require "awesome_print"
 require "yargi"
+require "sexp_grammar"

data/lib/gisele/version.rb

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

data/spec/command/main/gisele_ast_ruby.stdout

@@ -4,7 +4,7 @@
         :task_def,
         "Simple",
         [
-            :fluent,
+            :fluent_def,
             "diagKnown",
             [
                 :event_set,

data/spec/command/main/gisele_no_sugar.stdout

@@ -4,7 +4,7 @@
         :task_def,
         "Complete",
         [
-            :trackvar,
+            :trackvar_def,
             "everyOneHappy",
             [
                 :event_set,
@@ -16,7 +16,7 @@
             nil
         ],
         [
-            :fluent,
+            :fluent_def,
             "someoneHappy",
             [
                 :event_set,

data/spec/command/main/gisele_version.stdout

@@ -1,2 +1,2 @@
-gisele 0.3.0 (c) The University of Louvain
+gisele 0.4.0 (c) The University of Louvain
 SystemExit

data/spec/fixtures/tasks/simple.ast

@@ -4,7 +4,7 @@
         :task_def,
         "Simple",
         [
-            :fluent,
+            :fluent_def,
             "diagKnown",
             [
                 :event_set,

data/spec/spec_helper.rb

@@ -20,7 +20,11 @@ module SpecHelpers
   end
 
   def ast(text, rule, consume = true)
-    parse(text, rule, consume).to_ast
+    ast = parse(text, rule, consume).to_ast
+    unless sexp_grammar[rule] === ast
+      raise "expected #{ast} to match #{rule} (#{text})"
+    end
+    ast
   end
 
   def fixtures_dir
@@ -31,6 +35,10 @@ module SpecHelpers
     fixtures_dir.glob(glob)
   end
 
+  def sexp_grammar
+    Gisele::Language::SEXP_GRAMMAR
+  end
+
   def simple_ast
     Gisele::ast(fixtures_dir/:tasks/"simple.gis")
   end

data/spec/test_examples.rb

@@ -4,9 +4,17 @@ describe "The examples" do
   (Path.backfind(".[examples]")/:examples).glob("**/*.gis").each do |file|
 
     describe file do
+
+      let(:ast){ Gisele::ast(file) }
+
       it 'parses without any error' do
-        Gisele::ast(file).should be_a(Array)
+        ast.should be_a(Array)
       end
+
+      it 'respects the SexpGrammar' do
+        (Gisele::Language::SEXP_GRAMMAR === ast).should be_true
+      end
+
     end
 
   end

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

@@ -0,0 +1,20 @@
+require 'spec_helper'
+module Gisele::Language
+  describe "the Sexp grammar", "case_st" do
+
+    it 'matches when no variable is specified' do
+      case_st = \
+        [:case_st, nil,
+          [:when_clause, [:bool_expr, [:bool_lit, true]], [:nop_st]] ]
+      (sexp_grammar[:case_st] === case_st).should be_true
+    end
+
+    it 'matches when a variable is specified' do
+      case_st = \
+        [:case_st, [:var_ref, "varName"],
+          [:when_clause, [:bool_expr, [:bool_lit, true]], [:nop_st]] ]
+      (sexp_grammar[:case_st] === case_st).should be_true
+    end
+
+  end
+end

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

@@ -0,0 +1,14 @@
+require 'spec_helper'
+module Gisele::Language
+  describe "the Sexp grammar", "event_set" do
+
+    it 'matches an empty set' do
+      (sexp_grammar[:event_set] === [:event_set]).should be_true
+    end
+
+    it 'matches a non empty set' do
+      (sexp_grammar[:event_set] === [:event_set, "event", "Task:start"]).should be_true
+    end
+
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+module Gisele::Language
+  describe "the Sexp grammar", "fluent_def" do
+
+    let(:g){ SEXP_GRAMMAR }
+
+    it 'matches an fluent with initial value' do
+      fluent = [:fluent_def, "name", [:event_set, "start"], [:event_set, "stop"], true]
+      (sexp_grammar[:fluent_def] === fluent).should be_true
+    end
+
+    it 'matches an fluent without initial value' do
+      fluent = [:fluent_def, "name", [:event_set, "start"], [:event_set, "stop"], nil]
+      (sexp_grammar[:fluent_def] === fluent).should be_true
+    end
+
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+module Gisele::Language
+  describe "the Sexp grammar", "initially" do
+
+    it 'matches true' do
+      (sexp_grammar[:initially] === true).should be_true
+    end
+
+    it 'matches false' do
+      (sexp_grammar[:initially] === false).should be_true
+    end
+
+    it 'matches nil' do
+      (sexp_grammar[:initially] === nil).should be_true
+    end
+
+  end
+end

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

@@ -0,0 +1,10 @@
+require 'spec_helper'
+module Gisele::Language
+  describe "the Sexp grammar", "nop_st" do
+
+    it 'matches [:nop_st]' do
+      (sexp_grammar[:nop_st] === [:nop_st]).should be_true
+    end
+
+  end
+end

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

@@ -0,0 +1,12 @@
+require 'spec_helper'
+module Gisele::Language
+  describe "the Sexp grammar", "when_clause" do
+
+    it 'matches a valid when clause' do
+      when_clause = \
+        [:when_clause, [:bool_expr, [:bool_lit, true]], [:nop_st]]
+      (sexp_grammar[:when_clause] === when_clause).should be_true
+    end
+
+  end
+end

data/spec/unit/language/{test_elsif_flattener.rb → processors/test_elsif_flattener.rb}

@@ -7,9 +7,13 @@ module Gisele::Language
     end
 
     def rewrite(ast)
-      ElsifFlattener.new.call(ast)
+      @rewrited = ElsifFlattener.new.call(ast)
     end
 
+    after{
+      (sexp_grammar[:if_st] === @rewrited).should be_true
+    }
+
     it 'rewrites a single if correctly' do
       source = ast("if goodCond Task1 end")
       rewrite(source).should eq(source)

data/spec/unit/language/{test_if_to_case.rb → processors/test_if_to_case.rb}

@@ -7,9 +7,13 @@ module Gisele::Language
     end
 
     def rewrite(ast)
-      IfToCase.new.call(ast)
+      @rewrited = IfToCase.new.call(ast)
     end
 
+    after{
+      (sexp_grammar[:case_st] === @rewrited).should be_true
+    }
+
     it 'rewrites single if correctly' do
       source   = ast("if goodCond Task1 end")
       expected = \
@@ -83,12 +87,6 @@ module Gisele::Language
       rewrite(source).should eq(expected)
     end
 
-    it 'recurse on other nodes' do
-      if_st = ast("if goodCond Task1 end")
-      rw_st = rewrite(if_st)
-      rewrite([:unit, if_st]).should eq([:unit, rw_st])
-    end
-
     it 'keeps traceability markers on a single if' do
       if_st = ast("if goodCond Task1 end")
       rw_st = rewrite(if_st)

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

@@ -4,7 +4,7 @@ module Gisele::Language::Syntax
 
     it 'converts fluent definitions as expected' do
       defn     = "fluent diagKnown {Diagnosis:start, diagnosis}, {Treatment:end} initially false"
-      expected = [:fluent,
+      expected = [:fluent_def,
                    "diagKnown",
                    [:event_set, "Diagnosis:start", "diagnosis"],
                    [:event_set, "Treatment:end"],
@@ -14,7 +14,7 @@ module Gisele::Language::Syntax
 
     it 'does not require the initial value' do
       defn     = "fluent diagKnown {Diagnosis:start, diagnosis}, {Treatment:end}"
-      expected = [:fluent,
+      expected = [:fluent_def,
                    "diagKnown",
                    [:event_set, "Diagnosis:start", "diagnosis"],
                    [:event_set, "Treatment:end"],

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

@@ -11,12 +11,12 @@ module Gisele::Language::Syntax
       EXPR
       expected = \
         [:task_def, "Task1",
-          [:fluent, "diagKnown", [:event_set], [:event_set], nil],
+          [:fluent_def, "diagKnown", [:event_set], [:event_set], nil],
           [:task_call_st, "Task2"]]
       ast(expr, :task_def).should eq(expected)
     end
 
-    it 'uses :nop if no statement' do
+    it 'uses :nop_st if no statement' do
       expr = <<-EXPR.strip
         task Task1
           fluent diagKnown {}, {}
@@ -24,19 +24,19 @@ module Gisele::Language::Syntax
       EXPR
       expected = \
         [:task_def, "Task1",
-          [:fluent, "diagKnown", [:event_set], [:event_set], nil],
-          [:nop]]
+          [:fluent_def, "diagKnown", [:event_set], [:event_set], nil],
+          [:nop_st]]
       ast(expr, :task_def).should eq(expected)
     end
 
-    it 'uses :nop when empty' do
+    it 'uses :nop_st when empty' do
       expr = <<-EXPR.strip
         task Task1
         end
       EXPR
       expected = \
         [:task_def, "Task1",
-          [:nop]]
+          [:nop_st]]
       ast(expr, :task_def).should eq(expected)
     end
 

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

@@ -4,7 +4,7 @@ module Gisele::Language::Syntax
 
     it 'converts tracking variable definitions as expected' do
       defn     = "trackvar mplus {Diagnosis:start}"
-      expected = [:trackvar,
+      expected = [:trackvar_def,
                    "mplus",
                    [:event_set, "Diagnosis:start"],
                    [:event_set],
@@ -14,7 +14,7 @@ module Gisele::Language::Syntax
 
     it 'supports obsolete events and initial value' do
       defn     = "trackvar mplus {Diagnosis:start}, {Treatment:end} initially true"
-      expected = [:trackvar,
+      expected = [:trackvar_def,
                    "mplus",
                    [:event_set, "Diagnosis:start"],
                    [:event_set, "Treatment:end"],

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

@@ -8,7 +8,7 @@ module Gisele::Language::Syntax
       UNIT
       expected = \
         [:unit_def,
-          [:task_def, "Task1", [:nop]]]
+          [:task_def, "Task1", [:nop_st]]]
       ast(expr, :unit_def).should eq(expected)
     end
 
@@ -19,8 +19,8 @@ module Gisele::Language::Syntax
       UNIT
       expected = \
         [:unit_def,
-          [:task_def, "Task1", [:nop]],
-          [:task_def, "Task2", [:nop]] ]
+          [:task_def, "Task1", [:nop_st]],
+          [:task_def, "Task2", [:nop_st]] ]
       ast(expr, :unit_def).should eq(expected)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gisele
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70110318039380 !ruby/object:Gem::Requirement
+  requirement: &70178529922440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70110318039380
+  version_requirements: *70178529922440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70110318038460 !ruby/object:Gem::Requirement
+  requirement: &70178529919520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70110318038460
+  version_requirements: *70178529919520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70110318036100 !ruby/object:Gem::Requirement
+  requirement: &70178529917540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70110318036100
+  version_requirements: *70178529917540
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &70110318051380 !ruby/object:Gem::Requirement
+  requirement: &70178529916080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *70110318051380
+  version_requirements: *70178529916080
 - !ruby/object:Gem::Dependency
   name: citrus
-  requirement: &70110318050820 !ruby/object:Gem::Requirement
+  requirement: &70178529931480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70110318050820
+  version_requirements: *70178529931480
 - !ruby/object:Gem::Dependency
   name: epath
-  requirement: &70110318050260 !ruby/object:Gem::Requirement
+  requirement: &70178529930900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70110318050260
+  version_requirements: *70178529930900
 - !ruby/object:Gem::Dependency
   name: quickl
-  requirement: &70110318049560 !ruby/object:Gem::Requirement
+  requirement: &70178529930360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70110318049560
+  version_requirements: *70178529930360
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70110318048900 !ruby/object:Gem::Requirement
+  requirement: &70178529929540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70110318048900
+  version_requirements: *70178529929540
 - !ruby/object:Gem::Dependency
   name: yargi
-  requirement: &70110318048220 !ruby/object:Gem::Requirement
+  requirement: &70178529928700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,18 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70110318048220
+  version_requirements: *70178529928700
+- !ruby/object:Gem::Dependency
+  name: sexp_grammar
+  requirement: &70178529927800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70178529927800
 description: ! 'This is a fresh-new implementation of the process analysis techniques
 
   developed in the Gisele and PIPAS research projects at UCLouvain'
@@ -149,14 +160,18 @@ files:
 - lib/gisele/language/ast/when_clause.rb
 - lib/gisele/language/ast/while_st.rb
 - lib/gisele/language/ast.rb
-- lib/gisele/language/dot.yml
-- lib/gisele/language/elsif_flattener.rb
-- lib/gisele/language/if_to_case.rb
+- lib/gisele/language/grammar.citrus
+- lib/gisele/language/grammar.dot.yml
+- lib/gisele/language/grammar.sexp.yml
+- lib/gisele/language/processors/elsif_flattener.rb
+- lib/gisele/language/processors/if_to_case.rb
+- lib/gisele/language/processors/sugar_removal.rb
+- lib/gisele/language/processors/to_graph.rb
+- lib/gisele/language/processors.rb
 - lib/gisele/language/rewriter/helper.rb
 - lib/gisele/language/rewriter/scoping.rb
 - lib/gisele/language/rewriter/work_on_nodes.rb
 - lib/gisele/language/rewriter.rb
-- lib/gisele/language/sugar_removal.rb
 - lib/gisele/language/syntax/bool_and.rb
 - lib/gisele/language/syntax/bool_expr.rb
 - lib/gisele/language/syntax/bool_lit.rb
@@ -168,7 +183,6 @@ files:
 - lib/gisele/language/syntax/elsif_clause.rb
 - lib/gisele/language/syntax/event_set.rb
 - lib/gisele/language/syntax/fluent_def.rb
-- lib/gisele/language/syntax/grammar.citrus
 - lib/gisele/language/syntax/if_st.rb
 - lib/gisele/language/syntax/implicit_seq_st.rb
 - lib/gisele/language/syntax/node.rb
@@ -183,7 +197,6 @@ files:
 - lib/gisele/language/syntax/when_clause.rb
 - lib/gisele/language/syntax/while_st.rb
 - lib/gisele/language/syntax.rb
-- lib/gisele/language/to_graph.rb
 - lib/gisele/language.rb
 - lib/gisele/loader.rb
 - lib/gisele/version.rb
@@ -209,6 +222,15 @@ files:
 - spec/spec_helper.rb
 - spec/test_examples.rb
 - spec/unit/language/ast/test_node.rb
+- spec/unit/language/grammar_sexp/test_case_st.rb
+- spec/unit/language/grammar_sexp/test_event_set.rb
+- spec/unit/language/grammar_sexp/test_fluent_def.rb
+- spec/unit/language/grammar_sexp/test_initially.rb
+- spec/unit/language/grammar_sexp/test_nop_st.rb
+- spec/unit/language/grammar_sexp/test_when_clause.rb
+- spec/unit/language/processors/test_elsif_flattener.rb
+- spec/unit/language/processors/test_if_to_case.rb
+- spec/unit/language/processors/test_to_graph.rb
 - spec/unit/language/rewriter/test_helper.rb
 - spec/unit/language/rewriter/test_scoping.rb
 - spec/unit/language/rewriter/test_work_on_nodes.rb
@@ -250,11 +272,8 @@ files:
 - spec/unit/language/syntax/to_ast/test_when_clause.rb
 - spec/unit/language/syntax/to_ast/test_while_st.rb
 - spec/unit/language/test_ast.rb
-- spec/unit/language/test_elsif_flattener.rb
-- spec/unit/language/test_if_to_case.rb
 - spec/unit/language/test_rewriter.rb
 - spec/unit/language/test_syntax.rb
-- spec/unit/language/test_to_graph.rb
 - spec/unit/test_gisele.rb
 - spec/unit/test_language.rb
 - tasks/debug_mail.rake
@@ -277,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1270039991720770825
+      hash: 1798935773122407326
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -308,6 +327,15 @@ test_files:
 - spec/spec_helper.rb
 - spec/test_examples.rb
 - spec/unit/language/ast/test_node.rb
+- spec/unit/language/grammar_sexp/test_case_st.rb
+- spec/unit/language/grammar_sexp/test_event_set.rb
+- spec/unit/language/grammar_sexp/test_fluent_def.rb
+- spec/unit/language/grammar_sexp/test_initially.rb
+- spec/unit/language/grammar_sexp/test_nop_st.rb
+- spec/unit/language/grammar_sexp/test_when_clause.rb
+- spec/unit/language/processors/test_elsif_flattener.rb
+- spec/unit/language/processors/test_if_to_case.rb
+- spec/unit/language/processors/test_to_graph.rb
 - spec/unit/language/rewriter/test_helper.rb
 - spec/unit/language/rewriter/test_scoping.rb
 - spec/unit/language/rewriter/test_work_on_nodes.rb
@@ -349,10 +377,7 @@ test_files:
 - spec/unit/language/syntax/to_ast/test_when_clause.rb
 - spec/unit/language/syntax/to_ast/test_while_st.rb
 - spec/unit/language/test_ast.rb
-- spec/unit/language/test_elsif_flattener.rb
-- spec/unit/language/test_if_to_case.rb
 - spec/unit/language/test_rewriter.rb
 - spec/unit/language/test_syntax.rb
-- spec/unit/language/test_to_graph.rb
 - spec/unit/test_gisele.rb
 - spec/unit/test_language.rb