activefacts-cql 1.8.1 → 1.8.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/Gemfile +6 -5
  4. data/activefacts-cql.gemspec +4 -3
  5. data/lib/activefacts/cql/compiler.rb +29 -22
  6. data/lib/activefacts/cql/compiler/clause.rb +86 -84
  7. data/lib/activefacts/cql/compiler/constraint.rb +53 -53
  8. data/lib/activefacts/cql/compiler/entity_type.rb +28 -28
  9. data/lib/activefacts/cql/compiler/expression.rb +27 -27
  10. data/lib/activefacts/cql/compiler/fact.rb +37 -37
  11. data/lib/activefacts/cql/compiler/fact_type.rb +91 -85
  12. data/lib/activefacts/cql/compiler/informal.rb +48 -0
  13. data/lib/activefacts/cql/compiler/query.rb +52 -52
  14. data/lib/activefacts/cql/compiler/shared.rb +17 -17
  15. data/lib/activefacts/cql/compiler/value_type.rb +11 -11
  16. data/lib/activefacts/cql/parser/CQLParser.treetop +76 -56
  17. data/lib/activefacts/cql/parser/Context.treetop +15 -17
  18. data/lib/activefacts/cql/parser/Expressions.treetop +21 -21
  19. data/lib/activefacts/cql/parser/FactTypes.treetop +216 -216
  20. data/lib/activefacts/cql/parser/Language/English.treetop +136 -131
  21. data/lib/activefacts/cql/parser/Language/French.treetop +118 -118
  22. data/lib/activefacts/cql/parser/Language/Mandarin.treetop +111 -111
  23. data/lib/activefacts/cql/parser/LexicalRules.treetop +45 -45
  24. data/lib/activefacts/cql/parser/ObjectTypes.treetop +120 -120
  25. data/lib/activefacts/cql/parser/Terms.treetop +63 -63
  26. data/lib/activefacts/cql/parser/ValueTypes.treetop +71 -71
  27. data/lib/activefacts/cql/require.rb +8 -8
  28. data/lib/activefacts/cql/verbaliser.rb +88 -88
  29. data/lib/activefacts/cql/version.rb +1 -1
  30. data/lib/activefacts/input/cql.rb +7 -7
  31. metadata +12 -16
@@ -1,5 +1,5 @@
1
1
  module ActiveFacts
2
2
  module CQL
3
- VERSION = "1.8.1"
3
+ VERSION = "1.8.2"
4
4
  end
5
5
  end
@@ -14,13 +14,13 @@ module ActiveFacts
14
14
  class CQL
15
15
  # Read the specified file
16
16
  def self.readfile(filename)
17
- if File.basename(filename, '.cql') == "-"
18
- read(STDIN, "<standard input>")
19
- else
20
- File.open(filename) {|file|
21
- read(file, filename)
22
- }
23
- end
17
+ if File.basename(filename, '.cql') == "-"
18
+ read(STDIN, "<standard input>")
19
+ else
20
+ File.open(filename) {|file|
21
+ read(file, filename)
22
+ }
23
+ end
24
24
  rescue => e
25
25
  # Augment the exception message, but preserve the backtrace
26
26
  ne = StandardError.new("In #{filename} #{e.message.strip}")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activefacts-cql
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.1
4
+ version: 1.8.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Clifford Heath
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2015-12-04 00:00:00.000000000 Z
11
+ date: 2016-12-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -17,9 +17,6 @@ dependencies:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.10'
20
- - - "~>"
21
- - !ruby/object:Gem::Version
22
- version: 1.10.6
23
20
  type: :development
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
27
24
  - - ">="
28
25
  - !ruby/object:Gem::Version
29
26
  version: '1.10'
30
- - - "~>"
31
- - !ruby/object:Gem::Version
32
- version: 1.10.6
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: rake
35
29
  requirement: !ruby/object:Gem::Requirement
@@ -62,22 +56,22 @@ dependencies:
62
56
  name: activefacts-metamodel
63
57
  requirement: !ruby/object:Gem::Requirement
64
58
  requirements:
65
- - - ">="
66
- - !ruby/object:Gem::Version
67
- version: 1.8.3
68
59
  - - "~>"
69
60
  - !ruby/object:Gem::Version
70
61
  version: '1'
62
+ - - ">="
63
+ - !ruby/object:Gem::Version
64
+ version: 1.9.5
71
65
  type: :runtime
72
66
  prerelease: false
73
67
  version_requirements: !ruby/object:Gem::Requirement
74
68
  requirements:
75
- - - ">="
76
- - !ruby/object:Gem::Version
77
- version: 1.8.3
78
69
  - - "~>"
79
70
  - !ruby/object:Gem::Version
80
71
  version: '1'
72
+ - - ">="
73
+ - !ruby/object:Gem::Version
74
+ version: 1.9.5
81
75
  - !ruby/object:Gem::Dependency
82
76
  name: treetop
83
77
  requirement: !ruby/object:Gem::Requirement
@@ -103,7 +97,8 @@ description: Compiler for the Constellation Query Language, part of the ActiveFa
103
97
  email:
104
98
  - clifford.heath@gmail.com
105
99
  executables: []
106
- extensions: []
100
+ extensions:
101
+ - lib/activefacts/cql/Rakefile
107
102
  extra_rdoc_files: []
108
103
  files:
109
104
  - ".gitignore"
@@ -125,6 +120,7 @@ files:
125
120
  - lib/activefacts/cql/compiler/expression.rb
126
121
  - lib/activefacts/cql/compiler/fact.rb
127
122
  - lib/activefacts/cql/compiler/fact_type.rb
123
+ - lib/activefacts/cql/compiler/informal.rb
128
124
  - lib/activefacts/cql/compiler/query.rb
129
125
  - lib/activefacts/cql/compiler/shared.rb
130
126
  - lib/activefacts/cql/compiler/value_type.rb
@@ -166,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
166
162
  version: '0'
167
163
  requirements: []
168
164
  rubyforge_project:
169
- rubygems_version: 2.2.2
165
+ rubygems_version: 2.4.5
170
166
  signing_key:
171
167
  specification_version: 4
172
168
  summary: Compiler for the Constellation Query Language