expressir 1.0.0 → 1.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (142) hide show
  1. checksums.yaml +4 -4
  2. data/.yardopts +11 -0
  3. data/Rakefile +3 -0
  4. data/expressir.gemspec +3 -0
  5. data/lib/expressir/express/cache.rb +16 -10
  6. data/lib/expressir/express/formatter.rb +231 -180
  7. data/lib/expressir/express/hyperlink_formatter.rb +15 -1
  8. data/lib/expressir/express/model_visitor.rb +1 -0
  9. data/lib/expressir/express/parser.rb +16 -10
  10. data/lib/expressir/express/resolve_references_model_visitor.rb +7 -5
  11. data/lib/expressir/express/schema_head_formatter.rb +16 -2
  12. data/lib/expressir/express/visitor.rb +280 -254
  13. data/lib/expressir/model.rb +52 -45
  14. data/lib/expressir/model/cache.rb +6 -2
  15. data/lib/expressir/model/data_type.rb +9 -0
  16. data/lib/expressir/model/data_types/aggregate.rb +31 -0
  17. data/lib/expressir/model/data_types/array.rb +31 -0
  18. data/lib/expressir/model/data_types/bag.rb +25 -0
  19. data/lib/expressir/model/data_types/binary.rb +22 -0
  20. data/lib/expressir/model/data_types/boolean.rb +10 -0
  21. data/lib/expressir/model/data_types/enumeration.rb +25 -0
  22. data/lib/expressir/model/data_types/enumeration_item.rb +26 -0
  23. data/lib/expressir/model/data_types/generic.rb +26 -0
  24. data/lib/expressir/model/data_types/generic_entity.rb +26 -0
  25. data/lib/expressir/model/data_types/integer.rb +10 -0
  26. data/lib/expressir/model/data_types/list.rb +28 -0
  27. data/lib/expressir/model/data_types/logical.rb +10 -0
  28. data/lib/expressir/model/data_types/number.rb +10 -0
  29. data/lib/expressir/model/data_types/real.rb +19 -0
  30. data/lib/expressir/model/data_types/select.rb +28 -0
  31. data/lib/expressir/model/data_types/set.rb +25 -0
  32. data/lib/expressir/model/data_types/string.rb +22 -0
  33. data/lib/expressir/model/declaration.rb +9 -0
  34. data/lib/expressir/model/declarations/attribute.rb +47 -0
  35. data/lib/expressir/model/declarations/constant.rb +34 -0
  36. data/lib/expressir/model/declarations/entity.rb +53 -0
  37. data/lib/expressir/model/declarations/function.rb +67 -0
  38. data/lib/expressir/model/declarations/interface.rb +28 -0
  39. data/lib/expressir/model/declarations/interface_item.rb +23 -0
  40. data/lib/expressir/model/declarations/interfaced_item.rb +37 -0
  41. data/lib/expressir/model/declarations/parameter.rb +34 -0
  42. data/lib/expressir/model/declarations/procedure.rb +64 -0
  43. data/lib/expressir/model/declarations/remark_item.rb +21 -0
  44. data/lib/expressir/model/declarations/rule.rb +71 -0
  45. data/lib/expressir/model/declarations/schema.rb +117 -0
  46. data/lib/expressir/model/declarations/schema_version.rb +22 -0
  47. data/lib/expressir/model/declarations/schema_version_item.rb +22 -0
  48. data/lib/expressir/model/declarations/subtype_constraint.rb +40 -0
  49. data/lib/expressir/model/declarations/type.rb +45 -0
  50. data/lib/expressir/model/declarations/unique_rule.rb +31 -0
  51. data/lib/expressir/model/declarations/variable.rb +34 -0
  52. data/lib/expressir/model/declarations/where_rule.rb +31 -0
  53. data/lib/expressir/model/expression.rb +9 -0
  54. data/lib/expressir/model/expressions/aggregate_initializer.rb +6 -2
  55. data/lib/expressir/model/expressions/aggregate_initializer_item.rb +22 -0
  56. data/lib/expressir/model/expressions/binary_expression.rb +16 -5
  57. data/lib/expressir/model/expressions/entity_constructor.rb +8 -3
  58. data/lib/expressir/model/expressions/function_call.rb +22 -0
  59. data/lib/expressir/model/expressions/interval.rb +17 -6
  60. data/lib/expressir/model/expressions/query_expression.rb +11 -7
  61. data/lib/expressir/model/expressions/unary_expression.rb +9 -3
  62. data/lib/expressir/model/identifier.rb +26 -4
  63. data/lib/expressir/model/literal.rb +9 -0
  64. data/lib/expressir/model/literals/binary.rb +6 -2
  65. data/lib/expressir/model/literals/integer.rb +6 -2
  66. data/lib/expressir/model/literals/logical.rb +6 -2
  67. data/lib/expressir/model/literals/real.rb +6 -2
  68. data/lib/expressir/model/literals/string.rb +8 -3
  69. data/lib/expressir/model/model_element.rb +63 -37
  70. data/lib/expressir/model/reference.rb +9 -0
  71. data/lib/expressir/model/references/attribute_reference.rb +22 -0
  72. data/lib/expressir/model/references/group_reference.rb +22 -0
  73. data/lib/expressir/model/references/index_reference.rb +27 -0
  74. data/lib/expressir/model/references/simple_reference.rb +24 -0
  75. data/lib/expressir/model/repository.rb +7 -1
  76. data/lib/expressir/model/statement.rb +9 -0
  77. data/lib/expressir/model/statements/alias.rb +11 -7
  78. data/lib/expressir/model/statements/assignment.rb +8 -3
  79. data/lib/expressir/model/statements/case.rb +10 -4
  80. data/lib/expressir/model/statements/case_action.rb +7 -2
  81. data/lib/expressir/model/statements/compound.rb +6 -2
  82. data/lib/expressir/model/statements/escape.rb +3 -1
  83. data/lib/expressir/model/statements/if.rb +10 -4
  84. data/lib/expressir/model/statements/null.rb +3 -1
  85. data/lib/expressir/model/statements/procedure_call.rb +22 -0
  86. data/lib/expressir/model/statements/repeat.rb +19 -11
  87. data/lib/expressir/model/statements/return.rb +6 -2
  88. data/lib/expressir/model/statements/skip.rb +3 -1
  89. data/lib/expressir/model/supertype_expression.rb +9 -0
  90. data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb +29 -0
  91. data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb +19 -0
  92. data/lib/expressir/version.rb +1 -1
  93. data/spec/expressir/model/model_element_spec.rb +131 -131
  94. data/spec/syntax/multiple.yaml +68 -68
  95. data/spec/syntax/remark.yaml +64 -64
  96. data/spec/syntax/single.yaml +5 -5
  97. data/spec/syntax/single_formatted.yaml +5 -5
  98. data/spec/syntax/syntax.yaml +1003 -1030
  99. metadata +97 -45
  100. data/lib/expressir/model/attribute.rb +0 -38
  101. data/lib/expressir/model/constant.rb +0 -28
  102. data/lib/expressir/model/entity.rb +0 -42
  103. data/lib/expressir/model/enumeration_item.rb +0 -22
  104. data/lib/expressir/model/expressions/aggregate_item.rb +0 -17
  105. data/lib/expressir/model/expressions/attribute_reference.rb +0 -17
  106. data/lib/expressir/model/expressions/call.rb +0 -17
  107. data/lib/expressir/model/expressions/group_reference.rb +0 -17
  108. data/lib/expressir/model/expressions/index_reference.rb +0 -19
  109. data/lib/expressir/model/expressions/simple_reference.rb +0 -19
  110. data/lib/expressir/model/function.rb +0 -57
  111. data/lib/expressir/model/interface.rb +0 -20
  112. data/lib/expressir/model/interface_item.rb +0 -15
  113. data/lib/expressir/model/interfaced_item.rb +0 -27
  114. data/lib/expressir/model/parameter.rb +0 -28
  115. data/lib/expressir/model/procedure.rb +0 -55
  116. data/lib/expressir/model/remark_item.rb +0 -15
  117. data/lib/expressir/model/rule.rb +0 -60
  118. data/lib/expressir/model/schema.rb +0 -100
  119. data/lib/expressir/model/schema_version.rb +0 -15
  120. data/lib/expressir/model/schema_version_item.rb +0 -15
  121. data/lib/expressir/model/statements/call.rb +0 -17
  122. data/lib/expressir/model/subtype_constraint.rb +0 -32
  123. data/lib/expressir/model/type.rb +0 -37
  124. data/lib/expressir/model/types/aggregate.rb +0 -28
  125. data/lib/expressir/model/types/array.rb +0 -23
  126. data/lib/expressir/model/types/bag.rb +0 -19
  127. data/lib/expressir/model/types/binary.rb +0 -17
  128. data/lib/expressir/model/types/boolean.rb +0 -8
  129. data/lib/expressir/model/types/enumeration.rb +0 -19
  130. data/lib/expressir/model/types/generic.rb +0 -24
  131. data/lib/expressir/model/types/generic_entity.rb +0 -24
  132. data/lib/expressir/model/types/integer.rb +0 -8
  133. data/lib/expressir/model/types/list.rb +0 -21
  134. data/lib/expressir/model/types/logical.rb +0 -8
  135. data/lib/expressir/model/types/number.rb +0 -8
  136. data/lib/expressir/model/types/real.rb +0 -15
  137. data/lib/expressir/model/types/select.rb +0 -21
  138. data/lib/expressir/model/types/set.rb +0 -19
  139. data/lib/expressir/model/types/string.rb +0 -17
  140. data/lib/expressir/model/unique_rule.rb +0 -26
  141. data/lib/expressir/model/variable.rb +0 -28
  142. data/lib/expressir/model/where_rule.rb +0 -26
@@ -0,0 +1,9 @@
1
+ module Expressir
2
+ module Model
3
+ # Specified in ISO 10303-11:2004
4
+ # - section 12.7 References
5
+ # @abstract
6
+ class Reference < ModelElement
7
+ end
8
+ end
9
+ end
@@ -0,0 +1,22 @@
1
+ module Expressir
2
+ module Model
3
+ module References
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 12.7.3 Attribute references
6
+ class AttributeReference < Reference
7
+ model_attr_accessor :ref, 'Reference'
8
+ model_attr_accessor :attribute, 'Reference'
9
+
10
+ # @param [Hash] options
11
+ # @option options [Reference] :ref
12
+ # @option options [Reference] :attribute
13
+ def initialize(options = {})
14
+ @ref = options[:ref]
15
+ @attribute = options[:attribute]
16
+
17
+ super
18
+ end
19
+ end
20
+ end
21
+ end
22
+ end
@@ -0,0 +1,22 @@
1
+ module Expressir
2
+ module Model
3
+ module References
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 12.7.4 Group references
6
+ class GroupReference < Reference
7
+ model_attr_accessor :ref, 'Reference'
8
+ model_attr_accessor :entity, 'Reference'
9
+
10
+ # @param [Hash] options
11
+ # @option options [Reference] :ref
12
+ # @option options [Reference] :entity
13
+ def initialize(options = {})
14
+ @ref = options[:ref]
15
+ @entity = options[:entity]
16
+
17
+ super
18
+ end
19
+ end
20
+ end
21
+ end
22
+ end
@@ -0,0 +1,27 @@
1
+ module Expressir
2
+ module Model
3
+ module References
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 12.3.1 Binary indexing
6
+ # - section 12.5.1 String indexing
7
+ # - section 12.6.1 Aggregate indexing
8
+ class IndexReference < Reference
9
+ model_attr_accessor :ref, 'Reference'
10
+ model_attr_accessor :index1, 'Expression'
11
+ model_attr_accessor :index2, 'Expression'
12
+
13
+ # @param [Hash] options
14
+ # @option options [Reference] :ref
15
+ # @option options [Expression] :index1
16
+ # @option options [Expression] :index2
17
+ def initialize(options = {})
18
+ @ref = options[:ref]
19
+ @index1 = options[:index1]
20
+ @index2 = options[:index2]
21
+
22
+ super
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
@@ -0,0 +1,24 @@
1
+ module Expressir
2
+ module Model
3
+ module References
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 12.7.1 Simple references
6
+ class SimpleReference < Reference
7
+ model_attr_accessor :id, 'String'
8
+
9
+ model_attr_accessor :base_path, 'String'
10
+
11
+ # @param [Hash] options
12
+ # @option options [String] :id
13
+ # @option options [String] :base_path
14
+ def initialize(options = {})
15
+ @id = options[:id]
16
+
17
+ @base_path = options[:base_path]
18
+
19
+ super
20
+ end
21
+ end
22
+ end
23
+ end
24
+ end
@@ -1,14 +1,20 @@
1
1
  module Expressir
2
2
  module Model
3
+ # Specified in ISO 10303-11:2004
4
+ # - section 10 Scope and visibility
5
+ # - section 10.3.13 Schema
3
6
  class Repository < ModelElement
4
- model_attr_accessor :schemas
7
+ model_attr_accessor :schemas, 'Array<Schema>'
5
8
 
9
+ # @param [Hash] options
10
+ # @option options [Array<Schema>] :schemas
6
11
  def initialize(options = {})
7
12
  @schemas = options[:schemas] || []
8
13
 
9
14
  super
10
15
  end
11
16
 
17
+ # @return [Array<Declaration>]
12
18
  def children
13
19
  [
14
20
  *schemas
@@ -0,0 +1,9 @@
1
+ module Expressir
2
+ module Model
3
+ # Specified in ISO 10303-11:2004
4
+ # - section 13 Executable statements
5
+ # @abstract
6
+ class Statement < ModelElement
7
+ end
8
+ end
9
+ end
@@ -1,17 +1,20 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Alias < ModelElement
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.2 Alias statement
6
+ class Alias < Statement
5
7
  include Identifier
6
8
 
7
- model_attr_accessor :expression
8
- model_attr_accessor :statements
9
+ model_attr_accessor :expression, 'Expression'
10
+ model_attr_accessor :statements, 'Array<Statement>'
9
11
 
12
+ # @param [Hash] options
13
+ # @option (see Identifier#initialize_identifier)
14
+ # @option options [Expression] :expression
15
+ # @option options [Array<Statement>] :statements
10
16
  def initialize(options = {})
11
- @id = options[:id]
12
- @remarks = options[:remarks] || []
13
- @remark_items = options[:remark_items] || []
14
- @source = options[:source]
17
+ initialize_identifier(options)
15
18
 
16
19
  @expression = options[:expression]
17
20
  @statements = options[:statements] || []
@@ -19,6 +22,7 @@ module Expressir
19
22
  super
20
23
  end
21
24
 
25
+ # @return [Array<Declaration>]
22
26
  def children
23
27
  [
24
28
  self,
@@ -1,10 +1,15 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Assignment < ModelElement
5
- model_attr_accessor :ref
6
- model_attr_accessor :expression
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.3 Assignment
6
+ class Assignment < Statement
7
+ model_attr_accessor :ref, 'Reference'
8
+ model_attr_accessor :expression, 'Expression'
7
9
 
10
+ # @param [Hash] options
11
+ # @option options [Reference] :ref
12
+ # @option options [Expression] :expression
8
13
  def initialize(options = {})
9
14
  @ref = options[:ref]
10
15
  @expression = options[:expression]
@@ -1,11 +1,17 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Case < ModelElement
5
- model_attr_accessor :expression
6
- model_attr_accessor :actions
7
- model_attr_accessor :otherwise_statement
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.4 Case statement
6
+ class Case < Statement
7
+ model_attr_accessor :expression, 'Expression'
8
+ model_attr_accessor :actions, 'Array<CaseAction>'
9
+ model_attr_accessor :otherwise_statement, 'Statement'
8
10
 
11
+ # @param [Hash] options
12
+ # @option options [Expression] :expression
13
+ # @option options [Array<CaseAction>] :statements
14
+ # @option options [Statement] :otherwise_statement
9
15
  def initialize(options = {})
10
16
  @expression = options[:expression]
11
17
  @actions = options[:actions] || []
@@ -1,10 +1,15 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.4 Case statement
4
6
  class CaseAction < ModelElement
5
- model_attr_accessor :labels
6
- model_attr_accessor :statement
7
+ model_attr_accessor :labels, 'Array<Expression>'
8
+ model_attr_accessor :statement, 'Statement'
7
9
 
10
+ # @param [Hash] options
11
+ # @option options [Array<Expression>] :labels
12
+ # @option options [Statement] :statement
8
13
  def initialize(options = {})
9
14
  @labels = options[:labels] || []
10
15
  @statement = options[:statement]
@@ -1,9 +1,13 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Compound < ModelElement
5
- model_attr_accessor :statements
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.5 Compound statement
6
+ class Compound < Statement
7
+ model_attr_accessor :statements, 'Array<Statement>'
6
8
 
9
+ # @param [Hash] options
10
+ # @option options [Array<Statement>] :statements
7
11
  def initialize(options = {})
8
12
  @statements = options[:statements] || []
9
13
 
@@ -1,7 +1,9 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Escape < ModelElement
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.6 Escape statement
6
+ class Escape < Statement
5
7
  end
6
8
  end
7
9
  end
@@ -1,11 +1,17 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class If < ModelElement
5
- model_attr_accessor :expression
6
- model_attr_accessor :statements
7
- model_attr_accessor :else_statements
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.7 If ... Then ... Else statement
6
+ class If < Statement
7
+ model_attr_accessor :expression, 'Expression'
8
+ model_attr_accessor :statements, 'Array<Statement>'
9
+ model_attr_accessor :else_statements, 'Array<Statement>'
8
10
 
11
+ # @param [Hash] options
12
+ # @option options [Expression] :expression
13
+ # @option options [Array<Statement>] :statements
14
+ # @option options [Array<Statement>] :else_statements
9
15
  def initialize(options = {})
10
16
  @expression = options[:expression]
11
17
  @statements = options[:statements] || []
@@ -1,7 +1,9 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Null < ModelElement
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.1 Null (statement)
6
+ class Null < Statement
5
7
  end
6
8
  end
7
9
  end
@@ -0,0 +1,22 @@
1
+ module Expressir
2
+ module Model
3
+ module Statements
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.8 Procedure call statement
6
+ class ProcedureCall < Statement
7
+ model_attr_accessor :procedure, 'Reference'
8
+ model_attr_accessor :parameters, 'Array<Expression>'
9
+
10
+ # @param [Hash] options
11
+ # @option options [Reference] :procedure
12
+ # @option options [Array<Expression>] :parameters
13
+ def initialize(options = {})
14
+ @procedure = options[:procedure]
15
+ @parameters = options[:parameters] || []
16
+
17
+ super
18
+ end
19
+ end
20
+ end
21
+ end
22
+ end
@@ -1,21 +1,28 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Repeat < ModelElement
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.9 Repeat statement
6
+ class Repeat < Statement
5
7
  include Identifier
6
8
 
7
- model_attr_accessor :bound1
8
- model_attr_accessor :bound2
9
- model_attr_accessor :increment
10
- model_attr_accessor :while_expression
11
- model_attr_accessor :until_expression
12
- model_attr_accessor :statements
9
+ model_attr_accessor :bound1, 'Expression'
10
+ model_attr_accessor :bound2, 'Expression'
11
+ model_attr_accessor :increment, 'Expression'
12
+ model_attr_accessor :while_expression, 'Expression'
13
+ model_attr_accessor :until_expression, 'Expression'
14
+ model_attr_accessor :statements, 'Array<Statement>'
13
15
 
16
+ # @param [Hash] options
17
+ # @option (see Identifier#initialize_identifier)
18
+ # @option options [Expression] :bound1
19
+ # @option options [Expression] :bound2
20
+ # @option options [Expression] :increment
21
+ # @option options [Expression] :while_expression
22
+ # @option options [Expression] :until_expression
23
+ # @option options [Array<Statement>] :statements
14
24
  def initialize(options = {})
15
- @id = options[:id]
16
- @remarks = options[:remarks] || []
17
- @remark_items = options[:remark_items] || []
18
- @source = options[:source]
25
+ initialize_identifier(options)
19
26
 
20
27
  @bound1 = options[:bound1]
21
28
  @bound2 = options[:bound2]
@@ -27,6 +34,7 @@ module Expressir
27
34
  super
28
35
  end
29
36
 
37
+ # @return [Array<Declaration>]
30
38
  def children
31
39
  [
32
40
  self,
@@ -1,9 +1,13 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Return < ModelElement
5
- model_attr_accessor :expression
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.10 Return statement
6
+ class Return < Statement
7
+ model_attr_accessor :expression, 'Expression'
6
8
 
9
+ # @param [Hash] options
10
+ # @option options [Expression] :expression
7
11
  def initialize(options = {})
8
12
  @expression = options[:expression]
9
13
 
@@ -1,7 +1,9 @@
1
1
  module Expressir
2
2
  module Model
3
3
  module Statements
4
- class Skip < ModelElement
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 13.11 Skip statement
6
+ class Skip < Statement
5
7
  end
6
8
  end
7
9
  end
@@ -0,0 +1,9 @@
1
+ module Expressir
2
+ module Model
3
+ # Specified in ISO 10303-11:2004
4
+ # - section 9.2.5 Subtype/supertype constraints
5
+ # @abstract
6
+ class SupertypeExpression < ModelElement
7
+ end
8
+ end
9
+ end
@@ -0,0 +1,29 @@
1
+ module Expressir
2
+ module Model
3
+ module SupertypeExpressions
4
+ # Specified in ISO 10303-11:2004
5
+ # - section 9.2.5.3 ANDOR
6
+ # - section 9.2.5.4 AND
7
+ class BinarySupertypeExpression < SupertypeExpression
8
+ AND = :AND
9
+ ANDOR = :ANDOR
10
+
11
+ model_attr_accessor :operator, ':AND, :ANDOR'
12
+ model_attr_accessor :operand1, 'SupertypeExpression'
13
+ model_attr_accessor :operand2, 'SupertypeExpression'
14
+
15
+ # @param [Hash] options
16
+ # @option options [:AND, :ANDOR] :operator
17
+ # @option options [SupertypeExpression] :operand1
18
+ # @option options [SupertypeExpression] :operand2
19
+ def initialize(options = {})
20
+ @operator = options[:operator]
21
+ @operand1 = options[:operand1]
22
+ @operand2 = options[:operand2]
23
+
24
+ super
25
+ end
26
+ end
27
+ end
28
+ end
29
+ end