gisele 0.5.0 → 0.5.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (114) hide show
  1. data/CHANGELOG.md +5 -1
  2. data/Gemfile +4 -7
  3. data/Gemfile.lock +19 -19
  4. data/Rakefile +0 -4
  5. data/examples/merge/BreastCancer.dot +30 -0
  6. data/examples/merge/BreastCancer.gif +0 -0
  7. data/examples/merge/BreastCancer.gis +17 -0
  8. data/examples/merge/Merge.dot +46 -0
  9. data/examples/merge/Merge.gif +0 -0
  10. data/examples/merge/RectalCancer.dot +22 -0
  11. data/examples/merge/RectalCancer.gif +0 -0
  12. data/examples/merge/RectalCancer.gis +15 -0
  13. data/gisele.gemspec +3 -6
  14. data/gisele.noespec +11 -19
  15. data/lib/gisele.rb +0 -13
  16. data/lib/gisele/loader.rb +2 -3
  17. data/lib/gisele/version.rb +1 -1
  18. data/spec/command/main/gisele_version.stdout +1 -1
  19. data/spec/spec_helper.rb +0 -17
  20. data/tasks/gem.rake +9 -4
  21. metadata +65 -231
  22. data/lib/gisele/language.rb +0 -31
  23. data/lib/gisele/language/ast/bool_and.rb +0 -14
  24. data/lib/gisele/language/ast/bool_expr.rb +0 -22
  25. data/lib/gisele/language/ast/bool_not.rb +0 -14
  26. data/lib/gisele/language/ast/bool_or.rb +0 -14
  27. data/lib/gisele/language/ast/case_st.rb +0 -14
  28. data/lib/gisele/language/ast/else_clause.rb +0 -14
  29. data/lib/gisele/language/ast/elsif_clause.rb +0 -14
  30. data/lib/gisele/language/ast/if_st.rb +0 -14
  31. data/lib/gisele/language/ast/node.rb +0 -35
  32. data/lib/gisele/language/ast/task_call_st.rb +0 -14
  33. data/lib/gisele/language/ast/var_ref.rb +0 -14
  34. data/lib/gisele/language/ast/when_clause.rb +0 -14
  35. data/lib/gisele/language/ast/while_st.rb +0 -14
  36. data/lib/gisele/language/grammar.citrus +0 -236
  37. data/lib/gisele/language/grammar.sexp.yml +0 -83
  38. data/lib/gisele/language/processors.rb +0 -4
  39. data/lib/gisele/language/processors/elsif_flattener.rb +0 -36
  40. data/lib/gisele/language/processors/if_to_case.rb +0 -65
  41. data/lib/gisele/language/processors/scoping_helper.rb +0 -32
  42. data/lib/gisele/language/processors/sugar_removal.rb +0 -17
  43. data/lib/gisele/language/syntax/bool_and.rb +0 -14
  44. data/lib/gisele/language/syntax/bool_expr.rb +0 -14
  45. data/lib/gisele/language/syntax/bool_lit.rb +0 -14
  46. data/lib/gisele/language/syntax/bool_not.rb +0 -14
  47. data/lib/gisele/language/syntax/bool_or.rb +0 -14
  48. data/lib/gisele/language/syntax/bool_paren.rb +0 -14
  49. data/lib/gisele/language/syntax/case_st.rb +0 -19
  50. data/lib/gisele/language/syntax/else_clause.rb +0 -14
  51. data/lib/gisele/language/syntax/elsif_clause.rb +0 -16
  52. data/lib/gisele/language/syntax/event_set.rb +0 -15
  53. data/lib/gisele/language/syntax/fluent_def.rb +0 -18
  54. data/lib/gisele/language/syntax/if_st.rb +0 -18
  55. data/lib/gisele/language/syntax/implicit_seq_st.rb +0 -16
  56. data/lib/gisele/language/syntax/node.rb +0 -40
  57. data/lib/gisele/language/syntax/par_st.rb +0 -14
  58. data/lib/gisele/language/syntax/seq_st.rb +0 -14
  59. data/lib/gisele/language/syntax/st_list.rb +0 -14
  60. data/lib/gisele/language/syntax/task_call_st.rb +0 -14
  61. data/lib/gisele/language/syntax/task_def.rb +0 -18
  62. data/lib/gisele/language/syntax/trackvar_def.rb +0 -19
  63. data/lib/gisele/language/syntax/unit_def.rb +0 -14
  64. data/lib/gisele/language/syntax/var_ref.rb +0 -14
  65. data/lib/gisele/language/syntax/when_clause.rb +0 -16
  66. data/lib/gisele/language/syntax/while_st.rb +0 -16
  67. data/spec/unit/language/ast/test_bool_expr.rb +0 -50
  68. data/spec/unit/language/grammar_sexp/test_case_st.rb +0 -20
  69. data/spec/unit/language/grammar_sexp/test_event_set.rb +0 -14
  70. data/spec/unit/language/grammar_sexp/test_fluent_def.rb +0 -18
  71. data/spec/unit/language/grammar_sexp/test_initially.rb +0 -18
  72. data/spec/unit/language/grammar_sexp/test_nop_st.rb +0 -10
  73. data/spec/unit/language/grammar_sexp/test_when_clause.rb +0 -12
  74. data/spec/unit/language/processors/test_elsif_flattener.rb +0 -94
  75. data/spec/unit/language/processors/test_if_to_case.rb +0 -105
  76. data/spec/unit/language/processors/test_scoping_helper.rb +0 -45
  77. data/spec/unit/language/syntax/grammar/test_bool_expr.rb +0 -34
  78. data/spec/unit/language/syntax/grammar/test_boolean_literal.rb +0 -17
  79. data/spec/unit/language/syntax/grammar/test_case_st.rb +0 -60
  80. data/spec/unit/language/syntax/grammar/test_event.rb +0 -18
  81. data/spec/unit/language/syntax/grammar/test_event_name.rb +0 -21
  82. data/spec/unit/language/syntax/grammar/test_event_set.rb +0 -26
  83. data/spec/unit/language/syntax/grammar/test_fluent_def.rb +0 -21
  84. data/spec/unit/language/syntax/grammar/test_if_st.rb +0 -21
  85. data/spec/unit/language/syntax/grammar/test_par_st.rb +0 -11
  86. data/spec/unit/language/syntax/grammar/test_process_statement.rb +0 -19
  87. data/spec/unit/language/syntax/grammar/test_seq_st.rb +0 -11
  88. data/spec/unit/language/syntax/grammar/test_spaces.rb +0 -19
  89. data/spec/unit/language/syntax/grammar/test_spacing.rb +0 -17
  90. data/spec/unit/language/syntax/grammar/test_task_def.rb +0 -35
  91. data/spec/unit/language/syntax/grammar/test_task_name.rb +0 -19
  92. data/spec/unit/language/syntax/grammar/test_task_start_or_end.rb +0 -17
  93. data/spec/unit/language/syntax/grammar/test_trackvar_def.rb +0 -21
  94. data/spec/unit/language/syntax/grammar/test_unit_def.rb +0 -29
  95. data/spec/unit/language/syntax/grammar/test_variable_name.rb +0 -51
  96. data/spec/unit/language/syntax/grammar/test_when_clause.rb +0 -21
  97. data/spec/unit/language/syntax/grammar/test_while_st.rb +0 -11
  98. data/spec/unit/language/syntax/to_ast/test_bool_expr.rb +0 -32
  99. data/spec/unit/language/syntax/to_ast/test_case_st.rb +0 -47
  100. data/spec/unit/language/syntax/to_ast/test_else_clause.rb +0 -13
  101. data/spec/unit/language/syntax/to_ast/test_elsif_clause.rb +0 -15
  102. data/spec/unit/language/syntax/to_ast/test_event_set.rb +0 -24
  103. data/spec/unit/language/syntax/to_ast/test_fluent_def.rb +0 -26
  104. data/spec/unit/language/syntax/to_ast/test_if_st.rb +0 -39
  105. data/spec/unit/language/syntax/to_ast/test_par_st.rb +0 -12
  106. data/spec/unit/language/syntax/to_ast/test_seq_st.rb +0 -12
  107. data/spec/unit/language/syntax/to_ast/test_task_call_st.rb +0 -10
  108. data/spec/unit/language/syntax/to_ast/test_task_def.rb +0 -44
  109. data/spec/unit/language/syntax/to_ast/test_trackvar_def.rb +0 -26
  110. data/spec/unit/language/syntax/to_ast/test_unit_def.rb +0 -28
  111. data/spec/unit/language/syntax/to_ast/test_var_ref.rb +0 -12
  112. data/spec/unit/language/syntax/to_ast/test_when_clause.rb +0 -15
  113. data/spec/unit/language/syntax/to_ast/test_while_st.rb +0 -24
  114. data/spec/unit/language/test_syntax.rb +0 -51
@@ -1,3 +1,7 @@
1
+ # 0.5.1 / 2012-07-20
2
+
3
+ * Extracted the language part in a separate gisele-language gem.
4
+
1
5
  # 0.5.0 / 2012-02-26
2
6
 
3
7
  * Major enhancements
@@ -119,4 +123,4 @@
119
123
 
120
124
  * Enhancements
121
125
 
122
- * Birthday!
126
+ * Birthday!
data/Gemfile CHANGED
@@ -1,18 +1,15 @@
1
1
  source 'http://rubygems.org'
2
2
 
3
3
  group :runtime do
4
- gem "citrus", "~> 2.4"
5
- gem "epath", "~> 0.0.1"
4
+ gem "path", "~> 1.2"
6
5
  gem "quickl", "~> 0.4.3"
7
6
  gem "awesome_print", "~> 1.0"
8
7
  gem "yargi", "~> 0.2.0"
9
- gem "sexpr", "~> 0.5.0"
10
- gem "stamina-core", "~> 0.5.3"
8
+ gem "stamina-core", "~> 0.5.4"
9
+ gem "gisele-language", "~> 0.5.0"
11
10
  end
12
11
 
13
12
  group :development do
14
13
  gem "rake", "~> 0.9.2"
15
- gem "bundler", "~> 1.0"
16
- gem "rspec", "~> 2.8"
17
- gem "wlang", "~> 0.10.2"
14
+ gem "rspec", "~> 2.11"
18
15
  end
@@ -4,21 +4,24 @@ GEM
4
4
  awesome_print (1.0.2)
5
5
  citrus (2.4.1)
6
6
  diff-lcs (1.1.3)
7
- epath (0.0.1)
7
+ gisele-language (0.5.0)
8
+ citrus (~> 2.4)
9
+ path (~> 1.2)
10
+ sexpr (~> 0.5.0)
11
+ path (1.3.0)
8
12
  quickl (0.4.3)
9
13
  rake (0.9.2.2)
10
- rspec (2.8.0)
11
- rspec-core (~> 2.8.0)
12
- rspec-expectations (~> 2.8.0)
13
- rspec-mocks (~> 2.8.0)
14
- rspec-core (2.8.0)
15
- rspec-expectations (2.8.0)
16
- diff-lcs (~> 1.1.2)
17
- rspec-mocks (2.8.0)
18
- sexpr (0.5.0)
19
- stamina-core (0.5.3)
14
+ rspec (2.11.0)
15
+ rspec-core (~> 2.11.0)
16
+ rspec-expectations (~> 2.11.0)
17
+ rspec-mocks (~> 2.11.0)
18
+ rspec-core (2.11.1)
19
+ rspec-expectations (2.11.1)
20
+ diff-lcs (~> 1.1.3)
21
+ rspec-mocks (2.11.1)
22
+ sexpr (0.5.1)
23
+ stamina-core (0.5.4)
20
24
  quickl (~> 0.4.3)
21
- wlang (0.10.2)
22
25
  yargi (0.2.0)
23
26
 
24
27
  PLATFORMS
@@ -27,13 +30,10 @@ PLATFORMS
27
30
 
28
31
  DEPENDENCIES
29
32
  awesome_print (~> 1.0)
30
- bundler (~> 1.0)
31
- citrus (~> 2.4)
32
- epath (~> 0.0.1)
33
+ gisele-language (~> 0.5.0)
34
+ path (~> 1.2)
33
35
  quickl (~> 0.4.3)
34
36
  rake (~> 0.9.2)
35
- rspec (~> 2.8)
36
- sexpr (~> 0.5.0)
37
- stamina-core (~> 0.5.3)
38
- wlang (~> 0.10.2)
37
+ rspec (~> 2.11)
38
+ stamina-core (~> 0.5.4)
39
39
  yargi (~> 0.2.0)
data/Rakefile CHANGED
@@ -1,7 +1,3 @@
1
- # Dynamically load the gem spec
2
- $gemspec_file = File.expand_path('../gisele.gemspec', __FILE__)
3
- $gemspec = Kernel.eval(File.read($gemspec_file))
4
-
5
1
  # We run tests by default
6
2
  task :default => :test
7
3
 
@@ -0,0 +1,30 @@
1
+ digraph G {
2
+ graph [rankdir="LR"];
3
+ 10 [color="black" fillcolor="green" shape="circle" style="filled"];
4
+ 16 [color="black" fillcolor="white" shape="circle" style="filled"];
5
+ 15 [color="black" fillcolor="white" shape="circle" style="filled"];
6
+ 19 [color="black" fillcolor="white" shape="circle" style="filled"];
7
+ 18 [color="black" fillcolor="white" shape="circle" style="filled"];
8
+ 112 [color="black" fillcolor="white" shape="circle" style="filled"];
9
+ 115 [color="black" fillcolor="white" shape="circle" style="filled"];
10
+ 118 [color="black" fillcolor="white" shape="circle" style="filled"];
11
+ 117 [color="black" fillcolor="white" shape="circle" style="filled"];
12
+ 123 [color="black" fillcolor="white" shape="circle" style="filled"];
13
+ 126 [color="black" fillcolor="white" shape="circle" style="filled"];
14
+ 132 [color="black" fillcolor="white" shape="circle" style="filled"];
15
+ 129 [color="black" fillcolor="white" shape="circle" style="filled"];
16
+ 10 -> 16 [label="Diagnosis:start"];
17
+ 16 -> 15 [label="Diagnosis:end"];
18
+ 15 -> 19 [label="Psy:start"];
19
+ 19 -> 18 [label="Psy:end"];
20
+ 18 -> 112 [label="Staff:start"];
21
+ 112 -> 115 [label="Staff:end"];
22
+ 115 -> 118 [label="[t] / Radio:start"];
23
+ 118 -> 117 [label="Radio:end"];
24
+ 123 -> 126 [label="Chimio:end"];
25
+ 129 -> 117 [label="Consultation:end"];
26
+ 126 -> 129 [label="[not(ok)] / Consultation:start"];
27
+ 132 -> 117 [label="Radio:end"];
28
+ 126 -> 132 [label="[ok] / Radio:start"];
29
+ 115 -> 123 [label="[not(t)] / Chimio:start"];
30
+ }
@@ -0,0 +1,17 @@
1
+ task BreastCancer
2
+ seq
3
+ Diagnosis
4
+ Psy
5
+ Staff
6
+ if t
7
+ Radio
8
+ else
9
+ Chimio
10
+ if not(ok)
11
+ Consultation
12
+ else
13
+ Radio
14
+ end
15
+ end
16
+ end
17
+ end
@@ -0,0 +1,46 @@
1
+ digraph G {
2
+ graph [rankdir="LR"];
3
+
4
+ 20 [color="black" fillcolor="orange" shape="circle" style="filled"];
5
+ 26 [color="black" fillcolor="orange" shape="circle" style="filled"];
6
+ 25 [color="black" fillcolor="orange" shape="circle" style="filled"];
7
+
8
+ 19 [color="black" fillcolor="yellow" shape="circle" style="filled"];
9
+ 18 [color="black" fillcolor="yellow" shape="circle" style="filled"];
10
+ 112 [color="black" fillcolor="yellow" shape="circle" style="filled"];
11
+ 115 [color="black" fillcolor="yellow" shape="circle" style="filled"];
12
+ 118 [color="black" fillcolor="yellow" shape="circle" style="filled"];
13
+ 117 [color="black" fillcolor="yellow" shape="circle" style="filled"];
14
+ 123 [color="black" fillcolor="yellow" shape="circle" style="filled"];
15
+ 126 [color="black" fillcolor="yellow" shape="circle" style="filled"];
16
+ 129 [color="black" fillcolor="yellow" shape="circle" style="filled"];
17
+
18
+ 29 [color="black" fillcolor="red" shape="circle" style="filled"];
19
+ 212 [color="black" fillcolor="red" shape="circle" style="filled"];
20
+ 217 [color="black" fillcolor="red" shape="circle" style="filled"];
21
+ 220 [color="black" fillcolor="red" shape="circle" style="filled"];
22
+
23
+ 117 [color="black" fillcolor="orange" shape="circle" style="filled"];
24
+
25
+ 20 -> 26 [label="Diagnosis:start"];
26
+ 26 -> 25 [label="Diagnosis:end"];
27
+ 25 -> 19 [label="[wf1] / Psy:start"];
28
+ 19 -> 18 [label="Psy:end"];
29
+ 18 -> 112 [label="Staff:start"];
30
+ 112 -> 115 [label="Staff:end"];
31
+ 115 -> 118 [label="[t] / Radio:start"];
32
+ 118 -> 117 [label="Radio:end"];
33
+ 123 -> 126 [label="Chimio:end"];
34
+ 129 -> 117 [label="Consultation:end"];
35
+ 126 -> 129 [label="[not(ok)] / Consultation:start"];
36
+ 126 -> 118 [label="[ok] / Radio:start"];
37
+ 115 -> 123 [label="[not(t)] / Chimio:start"];
38
+
39
+ 25 -> 29 [label="[wf2] / Staff:start"];
40
+ 29 -> 212 [label="Staff:end"];
41
+ 217 -> 220 [label="Chimio:end"];
42
+ 220 -> 29 [label="[not(ok)] / Staff:start"];
43
+ 212 -> 217 [label="[not(t and m)] / Chimio:start"];
44
+ 212 -> 118 [label="[t and m] / Radio:start"]
45
+ 220 -> 118 [label="[ok] / Radio:start"]
46
+ }
Binary file
@@ -0,0 +1,22 @@
1
+ digraph G {
2
+ graph [rankdir="LR"];
3
+ 20 [color="black" fillcolor="green" shape="circle" style="filled"];
4
+ 26 [color="black" fillcolor="white" shape="circle" style="filled"];
5
+ 25 [color="black" fillcolor="white" shape="circle" style="filled"];
6
+ 29 [color="black" fillcolor="white" shape="circle" style="filled"];
7
+ 212 [color="black" fillcolor="white" shape="circle" style="filled"];
8
+ 217 [color="black" fillcolor="white" shape="circle" style="filled"];
9
+ 220 [color="black" fillcolor="white" shape="circle" style="filled"];
10
+ 226 [color="black" fillcolor="white" shape="circle" style="filled"];
11
+ 225 [color="black" fillcolor="white" shape="circle" style="filled"];
12
+ 20 -> 26 [label="Diagnosis:start"];
13
+ 26 -> 25 [label="Diagnosis:end"];
14
+ 25 -> 29 [label="Staff:start"];
15
+ 29 -> 212 [label="Staff:end"];
16
+ 217 -> 220 [label="Chimio:end"];
17
+ 220 -> 29 [label="[not(ok)] / Staff:start"];
18
+ 212 -> 217 [label="[not(t and m)] / Chimio:start"];
19
+ 226 -> 225 [label="Radio:end"];
20
+ 212 -> 226 [label="[t and m] / Radio:start"]
21
+ 220 -> 226 [label="[ok] / Radio:start"]
22
+ }
@@ -0,0 +1,15 @@
1
+ task RectalCancer
2
+
3
+ seq
4
+ Diagnosis
5
+ Staff
6
+ if not(t and m)
7
+ Chimio
8
+ while not(ok)
9
+ Chimio
10
+ end
11
+ end
12
+ Radio
13
+ end
14
+
15
+ end
@@ -124,16 +124,13 @@ Gem::Specification.new do |s|
124
124
  # for each development dependency. These gems are required for developers
125
125
  #
126
126
  s.add_development_dependency("rake", "~> 0.9.2")
127
- s.add_development_dependency("bundler", "~> 1.0")
128
- s.add_development_dependency("rspec", "~> 2.8")
129
- s.add_development_dependency("wlang", "~> 0.10.2")
130
- s.add_dependency("citrus", "~> 2.4")
131
- s.add_dependency("epath", "~> 0.0.1")
127
+ s.add_development_dependency("rspec", "~> 2.11")
128
+ s.add_dependency("path", "~> 1.2")
132
129
  s.add_dependency("quickl", "~> 0.4.3")
133
130
  s.add_dependency("awesome_print", "~> 1.0")
134
131
  s.add_dependency("yargi", "~> 0.2.0")
135
- s.add_dependency("sexpr", "~> 0.5.0")
136
132
  s.add_dependency("stamina-core", "~> 0.5.3")
133
+ s.add_dependency("gisele-language", "~> 0.5.0")
137
134
 
138
135
  # The version of ruby required by this gem
139
136
  #
@@ -1,8 +1,6 @@
1
1
  template-info:
2
- name: "ruby"
3
- version: 1.7.0
4
- links:
5
- source: https://github.com/blambeau/noe
2
+ name: rubygem.noe
3
+ version: 2.0.0
6
4
  manifest:
7
5
  spec/test___lower__.rb:
8
6
  ignore: true
@@ -12,28 +10,22 @@ variables:
12
10
  upper:
13
11
  Gisele
14
12
  version:
15
- 0.5.0
13
+ 0.5.1
16
14
  summary: |-
17
15
  Gisele is a Process Analyzer Toolset
18
16
  description: |-
19
17
  This is a fresh-new implementation of the process analysis techniques
20
18
  developed in the Gisele and PIPAS research projects at UCLouvain
21
-
22
- # Authors of the project (- {name: Bob, email: bob@gmail.com}, ...)
23
19
  authors:
24
20
  - {name: Bernard Lambeau, email: blambeau@gmail.com}
25
21
  links:
26
22
  - https://github.com/blambeau/gisele
27
23
  dependencies:
28
- - {name: citrus, version: "~> 2.4", groups: [runtime]}
29
- - {name: epath, version: "~> 0.0.1", groups: [runtime]}
30
- - {name: quickl, version: "~> 0.4.3", groups: [runtime]}
31
- - {name: awesome_print, version: "~> 1.0", groups: [runtime]}
32
- - {name: yargi, version: "~> 0.2.0", groups: [runtime]}
33
- - {name: sexpr, version: "~> 0.5.0", groups: [runtime]}
34
- - {name: stamina-core, version: "~> 0.5.3", groups: [runtime]}
35
- #
36
- - {name: rake, version: "~> 0.9.2", groups: [development]}
37
- - {name: bundler, version: "~> 1.0", groups: [development]}
38
- - {name: rspec, version: "~> 2.8", groups: [development]}
39
- - {name: wlang, version: "~> 0.10.2", groups: [development]}
24
+ - {name: path, version: "~> 1.2", groups: [runtime]}
25
+ - {name: quickl, version: "~> 0.4.3", groups: [runtime]}
26
+ - {name: awesome_print, version: "~> 1.0", groups: [runtime]}
27
+ - {name: yargi, version: "~> 0.2.0", groups: [runtime]}
28
+ - {name: stamina-core, version: "~> 0.5.4", groups: [runtime]}
29
+ - {name: gisele-language, version: "~> 0.5.0", groups: [runtime]}
30
+ - {name: rake, version: "~> 0.9.2", groups: [development]}
31
+ - {name: rspec, version: "~> 2.11", groups: [development]}
@@ -6,19 +6,6 @@ require_relative 'gisele/errors'
6
6
  #
7
7
  module Gisele
8
8
 
9
- def parse(*args)
10
- Language::parse(*args)
11
- end
12
-
13
- def ast(*args)
14
- Language::sexpr(*args)
15
- end
16
-
17
- def sexpr(*args)
18
- Language::sexpr(*args)
19
- end
20
-
21
9
  extend(self)
22
10
  end # module Gisele
23
- require_relative 'gisele/language'
24
11
  require_relative 'gisele/compiling'
@@ -1,7 +1,6 @@
1
- require "citrus"
2
- require "epath"
1
+ require "path"
3
2
  require "quickl"
4
3
  require "awesome_print"
5
4
  require "yargi"
6
- require "sexpr"
7
5
  require "stamina-core"
6
+ require "gisele-language"
@@ -3,7 +3,7 @@ module Gisele
3
3
 
4
4
  MAJOR = 0
5
5
  MINOR = 5
6
- TINY = 0
6
+ TINY = 1
7
7
 
8
8
  def self.to_s
9
9
  [ MAJOR, MINOR, TINY ].join('.')
@@ -1,2 +1,2 @@
1
- gisele 0.4.0 (c) The University of Louvain
1
+ gisele 0.5.0 (c) The University of Louvain
2
2
  SystemExit
@@ -13,19 +13,6 @@ end
13
13
 
14
14
  module SpecHelpers
15
15
 
16
- def parse(text, rule, consume = true)
17
- grammar = Gisele::Language::Grammar
18
- grammar.parse(text, :root => rule, :consume => consume)
19
- end
20
-
21
- def ast(text, rule, consume = true)
22
- ast = parse(text, rule, consume).to_ast
23
- unless sexp_grammar[rule] === ast
24
- raise "expected #{ast} to match #{rule} (#{text})"
25
- end
26
- ast
27
- end
28
-
29
16
  def fixtures_dir
30
17
  (Path.dir/:fixtures)
31
18
  end
@@ -34,10 +21,6 @@ module SpecHelpers
34
21
  fixtures_dir.glob(glob)
35
22
  end
36
23
 
37
- def sexp_grammar
38
- Gisele::Language
39
- end
40
-
41
24
  def simple_ast
42
25
  Gisele::ast(fixtures_dir/:tasks/"simple.gis")
43
26
  end
@@ -25,13 +25,18 @@
25
25
  #
26
26
  begin
27
27
  require 'rubygems/package_task'
28
- Gem::PackageTask.new($gemspec) do |t|
28
+
29
+ # Dynamically load the gem spec
30
+ gemspec_file = File.expand_path('../../gisele.gemspec', __FILE__)
31
+ gemspec = Kernel.eval(File.read(gemspec_file))
32
+
33
+ Gem::PackageTask.new(gemspec) do |t|
29
34
 
30
35
  # Name of the package
31
- t.name = $gemspec.name
36
+ t.name = gemspec.name
32
37
 
33
38
  # Version of the package
34
- t.version = $gemspec.version
39
+ t.version = gemspec.version
35
40
 
36
41
  # Directory used to store the package files
37
42
  t.package_dir = "pkg"
@@ -49,7 +54,7 @@ begin
49
54
  t.need_zip = false
50
55
 
51
56
  # List of files to be included in the package.
52
- t.package_files = $gemspec.files
57
+ t.package_files = gemspec.files
53
58
 
54
59
  # Tar command for gzipped or bzip2ed archives.
55
60
  t.tar_command = "tar"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gisele
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-26 00:00:00.000000000Z
12
+ date: 2012-07-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &69839060 !ruby/object:Gem::Requirement
16
+ requirement: &70306421708120 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,65 +21,32 @@ dependencies:
21
21
  version: 0.9.2
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *69839060
25
- - !ruby/object:Gem::Dependency
26
- name: bundler
27
- requirement: &69838720 !ruby/object:Gem::Requirement
28
- none: false
29
- requirements:
30
- - - ~>
31
- - !ruby/object:Gem::Version
32
- version: '1.0'
33
- type: :development
34
- prerelease: false
35
- version_requirements: *69838720
24
+ version_requirements: *70306421708120
36
25
  - !ruby/object:Gem::Dependency
37
26
  name: rspec
38
- requirement: &69838400 !ruby/object:Gem::Requirement
27
+ requirement: &70306421705080 !ruby/object:Gem::Requirement
39
28
  none: false
40
29
  requirements:
41
30
  - - ~>
42
31
  - !ruby/object:Gem::Version
43
- version: '2.8'
32
+ version: '2.11'
44
33
  type: :development
45
34
  prerelease: false
46
- version_requirements: *69838400
35
+ version_requirements: *70306421705080
47
36
  - !ruby/object:Gem::Dependency
48
- name: wlang
49
- requirement: &69838140 !ruby/object:Gem::Requirement
37
+ name: path
38
+ requirement: &70306421702520 !ruby/object:Gem::Requirement
50
39
  none: false
51
40
  requirements:
52
41
  - - ~>
53
42
  - !ruby/object:Gem::Version
54
- version: 0.10.2
55
- type: :development
56
- prerelease: false
57
- version_requirements: *69838140
58
- - !ruby/object:Gem::Dependency
59
- name: citrus
60
- requirement: &69837830 !ruby/object:Gem::Requirement
61
- none: false
62
- requirements:
63
- - - ~>
64
- - !ruby/object:Gem::Version
65
- version: '2.4'
43
+ version: '1.2'
66
44
  type: :runtime
67
45
  prerelease: false
68
- version_requirements: *69837830
69
- - !ruby/object:Gem::Dependency
70
- name: epath
71
- requirement: &69837550 !ruby/object:Gem::Requirement
72
- none: false
73
- requirements:
74
- - - ~>
75
- - !ruby/object:Gem::Version
76
- version: 0.0.1
77
- type: :runtime
78
- prerelease: false
79
- version_requirements: *69837550
46
+ version_requirements: *70306421702520
80
47
  - !ruby/object:Gem::Dependency
81
48
  name: quickl
82
- requirement: &69815800 !ruby/object:Gem::Requirement
49
+ requirement: &70306421700760 !ruby/object:Gem::Requirement
83
50
  none: false
84
51
  requirements:
85
52
  - - ~>
@@ -87,10 +54,10 @@ dependencies:
87
54
  version: 0.4.3
88
55
  type: :runtime
89
56
  prerelease: false
90
- version_requirements: *69815800
57
+ version_requirements: *70306421700760
91
58
  - !ruby/object:Gem::Dependency
92
59
  name: awesome_print
93
- requirement: &69815520 !ruby/object:Gem::Requirement
60
+ requirement: &70306421692720 !ruby/object:Gem::Requirement
94
61
  none: false
95
62
  requirements:
96
63
  - - ~>
@@ -98,10 +65,10 @@ dependencies:
98
65
  version: '1.0'
99
66
  type: :runtime
100
67
  prerelease: false
101
- version_requirements: *69815520
68
+ version_requirements: *70306421692720
102
69
  - !ruby/object:Gem::Dependency
103
70
  name: yargi
104
- requirement: &69815270 !ruby/object:Gem::Requirement
71
+ requirement: &70306421690940 !ruby/object:Gem::Requirement
105
72
  none: false
106
73
  requirements:
107
74
  - - ~>
@@ -109,29 +76,29 @@ dependencies:
109
76
  version: 0.2.0
110
77
  type: :runtime
111
78
  prerelease: false
112
- version_requirements: *69815270
79
+ version_requirements: *70306421690940
113
80
  - !ruby/object:Gem::Dependency
114
- name: sexpr
115
- requirement: &69814980 !ruby/object:Gem::Requirement
81
+ name: stamina-core
82
+ requirement: &70306421688480 !ruby/object:Gem::Requirement
116
83
  none: false
117
84
  requirements:
118
85
  - - ~>
119
86
  - !ruby/object:Gem::Version
120
- version: 0.5.0
87
+ version: 0.5.3
121
88
  type: :runtime
122
89
  prerelease: false
123
- version_requirements: *69814980
90
+ version_requirements: *70306421688480
124
91
  - !ruby/object:Gem::Dependency
125
- name: stamina-core
126
- requirement: &69814660 !ruby/object:Gem::Requirement
92
+ name: gisele-language
93
+ requirement: &70306421686800 !ruby/object:Gem::Requirement
127
94
  none: false
128
95
  requirements:
129
96
  - - ~>
130
97
  - !ruby/object:Gem::Version
131
- version: 0.5.3
98
+ version: 0.5.0
132
99
  type: :runtime
133
100
  prerelease: false
134
- version_requirements: *69814660
101
+ version_requirements: *70306421686800
135
102
  description: ! 'This is a fresh-new implementation of the process analysis techniques
136
103
 
137
104
  developed in the Gisele and PIPAS research projects at UCLouvain'
@@ -151,141 +118,56 @@ files:
151
118
  - Gemfile
152
119
  - Gemfile.lock
153
120
  - bin/gisele
154
- - examples/rectal-cancer-pathway/RectalCancerPathway.gis
155
121
  - examples/meeting-scheduler/MeetingScheduling.gis
156
- - lib/gisele.rb
157
- - lib/gisele/language.rb
158
- - lib/gisele/language/syntax/bool_not.rb
159
- - lib/gisele/language/syntax/task_def.rb
160
- - lib/gisele/language/syntax/bool_expr.rb
161
- - lib/gisele/language/syntax/trackvar_def.rb
162
- - lib/gisele/language/syntax/implicit_seq_st.rb
163
- - lib/gisele/language/syntax/when_clause.rb
164
- - lib/gisele/language/syntax/bool_lit.rb
165
- - lib/gisele/language/syntax/unit_def.rb
166
- - lib/gisele/language/syntax/case_st.rb
167
- - lib/gisele/language/syntax/event_set.rb
168
- - lib/gisele/language/syntax/fluent_def.rb
169
- - lib/gisele/language/syntax/node.rb
170
- - lib/gisele/language/syntax/bool_paren.rb
171
- - lib/gisele/language/syntax/st_list.rb
172
- - lib/gisele/language/syntax/var_ref.rb
173
- - lib/gisele/language/syntax/else_clause.rb
174
- - lib/gisele/language/syntax/elsif_clause.rb
175
- - lib/gisele/language/syntax/bool_and.rb
176
- - lib/gisele/language/syntax/if_st.rb
177
- - lib/gisele/language/syntax/par_st.rb
178
- - lib/gisele/language/syntax/seq_st.rb
179
- - lib/gisele/language/syntax/while_st.rb
180
- - lib/gisele/language/syntax/task_call_st.rb
181
- - lib/gisele/language/syntax/bool_or.rb
182
- - lib/gisele/language/grammar.citrus
183
- - lib/gisele/language/grammar.sexp.yml
184
- - lib/gisele/language/processors.rb
185
- - lib/gisele/language/processors/elsif_flattener.rb
186
- - lib/gisele/language/processors/if_to_case.rb
187
- - lib/gisele/language/processors/sugar_removal.rb
188
- - lib/gisele/language/processors/scoping_helper.rb
189
- - lib/gisele/language/ast/bool_not.rb
190
- - lib/gisele/language/ast/bool_expr.rb
191
- - lib/gisele/language/ast/when_clause.rb
192
- - lib/gisele/language/ast/case_st.rb
193
- - lib/gisele/language/ast/node.rb
194
- - lib/gisele/language/ast/var_ref.rb
195
- - lib/gisele/language/ast/else_clause.rb
196
- - lib/gisele/language/ast/elsif_clause.rb
197
- - lib/gisele/language/ast/bool_and.rb
198
- - lib/gisele/language/ast/if_st.rb
199
- - lib/gisele/language/ast/while_st.rb
200
- - lib/gisele/language/ast/task_call_st.rb
201
- - lib/gisele/language/ast/bool_or.rb
122
+ - examples/merge/BreastCancer.dot
123
+ - examples/merge/BreastCancer.gif
124
+ - examples/merge/BreastCancer.gis
125
+ - examples/merge/Merge.dot
126
+ - examples/merge/Merge.gif
127
+ - examples/merge/RectalCancer.dot
128
+ - examples/merge/RectalCancer.gif
129
+ - examples/merge/RectalCancer.gis
130
+ - examples/rectal-cancer-pathway/RectalCancerPathway.gis
131
+ - lib/gisele/command.rb
202
132
  - lib/gisele/compiling/to_glts.rb
203
133
  - lib/gisele/compiling/to_graph.rb
204
134
  - lib/gisele/compiling/to_graph.yml
135
+ - lib/gisele/compiling.rb
205
136
  - lib/gisele/errors.rb
206
137
  - lib/gisele/loader.rb
207
- - lib/gisele/compiling.rb
208
- - lib/gisele/command.rb
209
138
  - lib/gisele/version.rb
139
+ - lib/gisele.rb
210
140
  - LICENCE.md
211
141
  - Manifest.txt
212
142
  - Rakefile
213
143
  - README.md
214
- - spec/spec_helper.rb
215
- - spec/command/test_command.rb
216
- - spec/command/main/gisele_version.stdout
217
- - spec/command/main/gisele_graph.stdout
218
- - spec/command/main/gisele_no_sugar.cmd
219
- - spec/command/main/gisele_no_sugar.stdout
220
- - spec/command/main/gisele_help.stdout
221
- - spec/command/main/gisele_glts.cmd
222
- - spec/command/main/gisele_help.cmd
144
+ - spec/command/main/gisele_ast_ruby.cmd
223
145
  - spec/command/main/gisele_ast_ruby.stdout
146
+ - spec/command/main/gisele_glts.cmd
224
147
  - spec/command/main/gisele_glts.stdout
225
148
  - spec/command/main/gisele_graph.cmd
226
- - spec/command/main/gisele_ast_ruby.cmd
149
+ - spec/command/main/gisele_graph.stdout
150
+ - spec/command/main/gisele_help.cmd
151
+ - spec/command/main/gisele_help.stdout
152
+ - spec/command/main/gisele_no_sugar.cmd
153
+ - spec/command/main/gisele_no_sugar.stdout
227
154
  - spec/command/main/gisele_version.cmd
155
+ - spec/command/main/gisele_version.stdout
156
+ - spec/command/test_command.rb
157
+ - spec/fixtures/tasks/complete.gis
158
+ - spec/fixtures/tasks/simple.ast
159
+ - spec/fixtures/tasks/simple.gis
160
+ - spec/spec_helper.rb
228
161
  - spec/test_examples.rb
229
- - spec/unit/language/syntax/grammar/test_when_clause.rb
230
- - spec/unit/language/syntax/grammar/test_trackvar_def.rb
231
- - spec/unit/language/syntax/grammar/test_seq_st.rb
232
- - spec/unit/language/syntax/grammar/test_process_statement.rb
233
- - spec/unit/language/syntax/grammar/test_unit_def.rb
234
- - spec/unit/language/syntax/grammar/test_if_st.rb
235
- - spec/unit/language/syntax/grammar/test_boolean_literal.rb
236
- - spec/unit/language/syntax/grammar/test_task_def.rb
237
- - spec/unit/language/syntax/grammar/test_spacing.rb
238
- - spec/unit/language/syntax/grammar/test_task_start_or_end.rb
239
- - spec/unit/language/syntax/grammar/test_spaces.rb
240
- - spec/unit/language/syntax/grammar/test_event.rb
241
- - spec/unit/language/syntax/grammar/test_while_st.rb
242
- - spec/unit/language/syntax/grammar/test_par_st.rb
243
- - spec/unit/language/syntax/grammar/test_task_name.rb
244
- - spec/unit/language/syntax/grammar/test_case_st.rb
245
- - spec/unit/language/syntax/grammar/test_variable_name.rb
246
- - spec/unit/language/syntax/grammar/test_fluent_def.rb
247
- - spec/unit/language/syntax/grammar/test_event_set.rb
248
- - spec/unit/language/syntax/grammar/test_bool_expr.rb
249
- - spec/unit/language/syntax/grammar/test_event_name.rb
250
- - spec/unit/language/syntax/to_ast/test_when_clause.rb
251
- - spec/unit/language/syntax/to_ast/test_else_clause.rb
252
- - spec/unit/language/syntax/to_ast/test_trackvar_def.rb
253
- - spec/unit/language/syntax/to_ast/test_seq_st.rb
254
- - spec/unit/language/syntax/to_ast/test_var_ref.rb
255
- - spec/unit/language/syntax/to_ast/test_unit_def.rb
256
- - spec/unit/language/syntax/to_ast/test_if_st.rb
257
- - spec/unit/language/syntax/to_ast/test_task_def.rb
258
- - spec/unit/language/syntax/to_ast/test_elsif_clause.rb
259
- - spec/unit/language/syntax/to_ast/test_while_st.rb
260
- - spec/unit/language/syntax/to_ast/test_par_st.rb
261
- - spec/unit/language/syntax/to_ast/test_task_call_st.rb
262
- - spec/unit/language/syntax/to_ast/test_case_st.rb
263
- - spec/unit/language/syntax/to_ast/test_fluent_def.rb
264
- - spec/unit/language/syntax/to_ast/test_event_set.rb
265
- - spec/unit/language/syntax/to_ast/test_bool_expr.rb
266
- - spec/unit/language/test_syntax.rb
267
- - spec/unit/language/grammar_sexp/test_when_clause.rb
268
- - spec/unit/language/grammar_sexp/test_nop_st.rb
269
- - spec/unit/language/grammar_sexp/test_case_st.rb
270
- - spec/unit/language/grammar_sexp/test_initially.rb
271
- - spec/unit/language/grammar_sexp/test_fluent_def.rb
272
- - spec/unit/language/grammar_sexp/test_event_set.rb
273
- - spec/unit/language/processors/test_scoping_helper.rb
274
- - spec/unit/language/processors/test_elsif_flattener.rb
275
- - spec/unit/language/processors/test_if_to_case.rb
276
- - spec/unit/language/ast/test_bool_expr.rb
277
162
  - spec/unit/compiling/test_to_glts.rb
278
163
  - spec/unit/compiling/test_to_graph.rb
279
164
  - spec/unit/test_gisele.rb
280
- - spec/fixtures/tasks/simple.ast
281
- - spec/fixtures/tasks/simple.gis
282
- - spec/fixtures/tasks/complete.gis
283
165
  - tasks/debug_mail.rake
284
- - tasks/yard.rake
166
+ - tasks/debug_mail.txt
285
167
  - tasks/gem.rake
286
168
  - tasks/spec_test.rake
287
169
  - tasks/unit_test.rake
288
- - tasks/debug_mail.txt
170
+ - tasks/yard.rake
289
171
  homepage: https://github.com/blambeau/gisele
290
172
  licenses: []
291
173
  post_install_message:
@@ -311,72 +193,24 @@ signing_key:
311
193
  specification_version: 3
312
194
  summary: Gisele is a Process Analyzer Toolset
313
195
  test_files:
314
- - spec/spec_helper.rb
315
- - spec/command/test_command.rb
316
- - spec/command/main/gisele_version.stdout
317
- - spec/command/main/gisele_graph.stdout
318
- - spec/command/main/gisele_no_sugar.cmd
319
- - spec/command/main/gisele_no_sugar.stdout
320
- - spec/command/main/gisele_help.stdout
321
- - spec/command/main/gisele_glts.cmd
322
- - spec/command/main/gisele_help.cmd
196
+ - spec/command/main/gisele_ast_ruby.cmd
323
197
  - spec/command/main/gisele_ast_ruby.stdout
198
+ - spec/command/main/gisele_glts.cmd
324
199
  - spec/command/main/gisele_glts.stdout
325
200
  - spec/command/main/gisele_graph.cmd
326
- - spec/command/main/gisele_ast_ruby.cmd
201
+ - spec/command/main/gisele_graph.stdout
202
+ - spec/command/main/gisele_help.cmd
203
+ - spec/command/main/gisele_help.stdout
204
+ - spec/command/main/gisele_no_sugar.cmd
205
+ - spec/command/main/gisele_no_sugar.stdout
327
206
  - spec/command/main/gisele_version.cmd
207
+ - spec/command/main/gisele_version.stdout
208
+ - spec/command/test_command.rb
209
+ - spec/fixtures/tasks/complete.gis
210
+ - spec/fixtures/tasks/simple.ast
211
+ - spec/fixtures/tasks/simple.gis
212
+ - spec/spec_helper.rb
328
213
  - spec/test_examples.rb
329
- - spec/unit/language/syntax/grammar/test_when_clause.rb
330
- - spec/unit/language/syntax/grammar/test_trackvar_def.rb
331
- - spec/unit/language/syntax/grammar/test_seq_st.rb
332
- - spec/unit/language/syntax/grammar/test_process_statement.rb
333
- - spec/unit/language/syntax/grammar/test_unit_def.rb
334
- - spec/unit/language/syntax/grammar/test_if_st.rb
335
- - spec/unit/language/syntax/grammar/test_boolean_literal.rb
336
- - spec/unit/language/syntax/grammar/test_task_def.rb
337
- - spec/unit/language/syntax/grammar/test_spacing.rb
338
- - spec/unit/language/syntax/grammar/test_task_start_or_end.rb
339
- - spec/unit/language/syntax/grammar/test_spaces.rb
340
- - spec/unit/language/syntax/grammar/test_event.rb
341
- - spec/unit/language/syntax/grammar/test_while_st.rb
342
- - spec/unit/language/syntax/grammar/test_par_st.rb
343
- - spec/unit/language/syntax/grammar/test_task_name.rb
344
- - spec/unit/language/syntax/grammar/test_case_st.rb
345
- - spec/unit/language/syntax/grammar/test_variable_name.rb
346
- - spec/unit/language/syntax/grammar/test_fluent_def.rb
347
- - spec/unit/language/syntax/grammar/test_event_set.rb
348
- - spec/unit/language/syntax/grammar/test_bool_expr.rb
349
- - spec/unit/language/syntax/grammar/test_event_name.rb
350
- - spec/unit/language/syntax/to_ast/test_when_clause.rb
351
- - spec/unit/language/syntax/to_ast/test_else_clause.rb
352
- - spec/unit/language/syntax/to_ast/test_trackvar_def.rb
353
- - spec/unit/language/syntax/to_ast/test_seq_st.rb
354
- - spec/unit/language/syntax/to_ast/test_var_ref.rb
355
- - spec/unit/language/syntax/to_ast/test_unit_def.rb
356
- - spec/unit/language/syntax/to_ast/test_if_st.rb
357
- - spec/unit/language/syntax/to_ast/test_task_def.rb
358
- - spec/unit/language/syntax/to_ast/test_elsif_clause.rb
359
- - spec/unit/language/syntax/to_ast/test_while_st.rb
360
- - spec/unit/language/syntax/to_ast/test_par_st.rb
361
- - spec/unit/language/syntax/to_ast/test_task_call_st.rb
362
- - spec/unit/language/syntax/to_ast/test_case_st.rb
363
- - spec/unit/language/syntax/to_ast/test_fluent_def.rb
364
- - spec/unit/language/syntax/to_ast/test_event_set.rb
365
- - spec/unit/language/syntax/to_ast/test_bool_expr.rb
366
- - spec/unit/language/test_syntax.rb
367
- - spec/unit/language/grammar_sexp/test_when_clause.rb
368
- - spec/unit/language/grammar_sexp/test_nop_st.rb
369
- - spec/unit/language/grammar_sexp/test_case_st.rb
370
- - spec/unit/language/grammar_sexp/test_initially.rb
371
- - spec/unit/language/grammar_sexp/test_fluent_def.rb
372
- - spec/unit/language/grammar_sexp/test_event_set.rb
373
- - spec/unit/language/processors/test_scoping_helper.rb
374
- - spec/unit/language/processors/test_elsif_flattener.rb
375
- - spec/unit/language/processors/test_if_to_case.rb
376
- - spec/unit/language/ast/test_bool_expr.rb
377
214
  - spec/unit/compiling/test_to_glts.rb
378
215
  - spec/unit/compiling/test_to_graph.rb
379
216
  - spec/unit/test_gisele.rb
380
- - spec/fixtures/tasks/simple.ast
381
- - spec/fixtures/tasks/simple.gis
382
- - spec/fixtures/tasks/complete.gis