expressir 0.2.9-x86-mingw32 → 0.2.14-x86-mingw32

data/lib/expressir/model/types/binary.rb

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Types
-      class Binary
+      class Binary < ModelElement
         attr_accessor :width
         attr_accessor :fixed
 
         def initialize(options = {})
           @width = options[:width]
           @fixed = options[:fixed]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/boolean.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Boolean
+      class Boolean < ModelElement
       end
     end
   end

data/lib/expressir/model/types/enumeration.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Enumeration
+      class Enumeration < ModelElement
         attr_accessor :extensible
         attr_accessor :items
         attr_accessor :extension_type
@@ -9,9 +9,11 @@ module Expressir
 
         def initialize(options = {})
           @extensible = options[:extensible]
-          @items = options[:items]
+          @items = options.fetch(:items, [])
           @extension_type = options[:extension_type]
-          @extension_items = options[:extension_items]
+          @extension_items = options.fetch(:extension_items, [])
+
+          super
         end
       end
     end

data/lib/expressir/model/types/generic.rb

@@ -1,11 +1,15 @@
 module Expressir
   module Model
     module Types
-      class Generic
+      class Generic < ModelElement
         include Identifier
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/generic_entity.rb

@@ -1,11 +1,15 @@
 module Expressir
   module Model
     module Types
-      class GenericEntity
+      class GenericEntity < ModelElement
         include Identifier
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/integer.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Integer
+      class Integer < ModelElement
       end
     end
   end

data/lib/expressir/model/types/list.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class List
+      class List < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :unique
@@ -12,6 +12,8 @@ module Expressir
           @bound2 = options[:bound2]
           @unique = options[:unique]
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/logical.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Logical
+      class Logical < ModelElement
       end
     end
   end

data/lib/expressir/model/types/number.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Number
+      class Number < ModelElement
       end
     end
   end

data/lib/expressir/model/types/real.rb

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Types
-      class Real
+      class Real < ModelElement
         attr_accessor :precision
 
         def initialize(options = {})
           @precision = options[:precision]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/select.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Select
+      class Select < ModelElement
         attr_accessor :extensible
         attr_accessor :generic_entity
         attr_accessor :items
@@ -11,9 +11,11 @@ module Expressir
         def initialize(options = {})
           @extensible = options[:extensible]
           @generic_entity = options[:generic_entity]
-          @items = options[:items]
+          @items = options.fetch(:items, [])
           @extension_type = options[:extension_type]
-          @extension_items = options[:extension_items]
+          @extension_items = options.fetch(:extension_items, [])
+
+          super
         end
       end
     end

data/lib/expressir/model/types/set.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Set
+      class Set < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :base_type
@@ -10,6 +10,8 @@ module Expressir
           @bound1 = options[:bound1]
           @bound2 = options[:bound2]
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/string.rb

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Types
-      class String
+      class String < ModelElement
         attr_accessor :width
         attr_accessor :fixed
 
         def initialize(options = {})
           @width = options[:width]
           @fixed = options[:fixed]
+
+          super
         end
       end
     end

data/lib/expressir/model/unique.rb

@@ -1,14 +1,18 @@
 module Expressir
   module Model
-    class Unique
+    class Unique < ModelElement
       include Identifier
 
       attr_accessor :attributes
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
-        @attributes = options[:attributes]
+        @attributes = options.fetch(:attributes, [])
+
+        super
       end
     end
   end

data/lib/expressir/model/variable.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Variable
+    class Variable < ModelElement
       include Identifier
 
       attr_accessor :type
@@ -8,9 +8,13 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @type = options[:type]
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/model/where.rb

@@ -1,14 +1,18 @@
 module Expressir
   module Model
-    class Where
+    class Where < ModelElement
       include Identifier
 
       attr_accessor :expression
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.9".freeze
+  VERSION = "0.2.14".freeze
 end

data/original/examples/syntax/hyperlink.exp

@@ -0,0 +1,8 @@
+SCHEMA hyperlink_schema;
+ENTITY test; END_ENTITY;
+ENTITY empty_entity; END_ENTITY;
+ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
+ENTITY subtype_empty_entity SUBTYPE OF (empty_entity); END_ENTITY;
+ENTITY subtype_attribute_entity SUBTYPE OF (attribute_entity); SELF\attribute_entity.test : BOOLEAN; END_ENTITY;
+ENTITY subtype_missing_entity SUBTYPE OF (missing_entity); END_ENTITY;
+END_SCHEMA;

data/original/examples/syntax/hyperlink_formatted.exp

@@ -0,0 +1,19 @@
+SCHEMA hyperlink_schema;
+ENTITY test;
+END_ENTITY;
+ENTITY empty_entity;
+END_ENTITY;
+ENTITY attribute_entity;
+  test : BOOLEAN;
+END_ENTITY;
+ENTITY subtype_empty_entity
+  SUBTYPE OF ({{{<<express:hyperlink_schema.empty_entity,empty_entity>>}}});
+END_ENTITY;
+ENTITY subtype_attribute_entity
+  SUBTYPE OF ({{{<<express:hyperlink_schema.attribute_entity,attribute_entity>>}}});
+  SELF\{{{<<express:hyperlink_schema.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
+END_ENTITY;
+ENTITY subtype_missing_entity
+  SUBTYPE OF (missing_entity);
+END_ENTITY;
+END_SCHEMA;

data/original/examples/syntax/remark_formatted.exp

@@ -6,7 +6,6 @@ TYPE remark_type = ENUMERATION OF (remark_enumeration_item);
   WHERE
     WR1 : TRUE;
 END_TYPE;
-
 ENTITY remark_entity;
   remark_attribute : STRING;
   DERIVE
@@ -18,10 +17,8 @@ ENTITY remark_entity;
   WHERE
     WR1 : TRUE;
 END_ENTITY;
-
 SUBTYPE_CONSTRAINT remark_subtype_constraint FOR remark_entity;
 END_SUBTYPE_CONSTRAINT;
-
 FUNCTION remark_function(remark_parameter : STRING) : BOOLEAN;
   TYPE remark_type = ENUMERATION OF (remark_enumeration_item);
   END_TYPE;
@@ -43,7 +40,6 @@ FUNCTION remark_function(remark_parameter : STRING) : BOOLEAN;
   --"remark_query" function query scope - function query
   );
 END_FUNCTION;
-
 PROCEDURE remark_procedure(remark_parameter : STRING);
   TYPE remark_type = ENUMERATION OF (remark_enumeration_item);
   END_TYPE;
@@ -65,7 +61,6 @@ PROCEDURE remark_procedure(remark_parameter : STRING);
   --"remark_query" procedure query scope - procedure query
   );
 END_PROCEDURE;
-
 RULE remark_rule FOR (remark_entity);
   TYPE remark_type = ENUMERATION OF (remark_enumeration_item);
   END_TYPE;

data/original/examples/syntax/simple.exp

@@ -0,0 +1,3 @@
+SCHEMA simple_schema;
+ENTITY empty_entity; END_ENTITY;
+END_SCHEMA;

data/original/examples/syntax/syntax.exp

@@ -31,23 +31,23 @@ ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
 ENTITY attribute_optional_entity; test : OPTIONAL BOOLEAN; END_ENTITY;
 ENTITY attribute_multiple_entity; test : BOOLEAN; test2 : BOOLEAN; END_ENTITY;
 ENTITY attribute_multiple_shorthand_entity; test, test2 : BOOLEAN; END_ENTITY;
-ENTITY attribute_redeclared_entity; SELF\attribute_entity.test : BOOLEAN; END_ENTITY;
-ENTITY attribute_redeclared_renamed_entity; SELF\attribute_entity.test RENAMED test2 : BOOLEAN; END_ENTITY;
+ENTITY attribute_redeclared_entity SUBTYPE OF (attribute_entity); SELF\attribute_entity.test : BOOLEAN; END_ENTITY;
+ENTITY attribute_redeclared_renamed_entity SUBTYPE OF (attribute_entity); SELF\attribute_entity.test RENAMED test2 : BOOLEAN; END_ENTITY;
 ENTITY derived_attribute_entity; DERIVE test : BOOLEAN := TRUE; END_ENTITY;
-ENTITY derived_attribute_redeclared_entity; DERIVE SELF\attribute_entity.test : BOOLEAN := TRUE; END_ENTITY;
-ENTITY derived_attribute_redeclared_renamed_entity; DERIVE SELF\attribute_entity.test RENAMED test2 : BOOLEAN := TRUE; END_ENTITY;
+ENTITY derived_attribute_redeclared_entity SUBTYPE OF (attribute_entity); DERIVE SELF\attribute_entity.test : BOOLEAN := TRUE; END_ENTITY;
+ENTITY derived_attribute_redeclared_renamed_entity SUBTYPE OF (attribute_entity); DERIVE SELF\attribute_entity.test RENAMED test2 : BOOLEAN := TRUE; END_ENTITY;
 ENTITY inverse_attribute_entity; INVERSE test : attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_entity_entity; INVERSE test : attribute_entity FOR attribute_entity.test; END_ENTITY;
 ENTITY inverse_attribute_set_entity; INVERSE test : SET OF attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_set_bound_entity; INVERSE test : SET [1:9] OF attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_bag_entity; INVERSE test : BAG OF attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_bag_bound_entity; INVERSE test : BAG [1:9] OF attribute_entity FOR test; END_ENTITY;
-ENTITY inverse_attribute_redeclared_entity; INVERSE SELF\attribute_entity.test : attribute_entity FOR test; END_ENTITY;
-ENTITY inverse_attribute_redeclared_renamed_entity; INVERSE SELF\attribute_entity.test RENAMED test2 : attribute_entity FOR test; END_ENTITY;
+ENTITY inverse_attribute_redeclared_entity SUBTYPE OF (attribute_entity); INVERSE SELF\attribute_entity.test : attribute_entity FOR test; END_ENTITY;
+ENTITY inverse_attribute_redeclared_renamed_entity SUBTYPE OF (attribute_entity); INVERSE SELF\attribute_entity.test RENAMED test2 : attribute_entity FOR test; END_ENTITY;
 ENTITY unique_entity; test : BOOLEAN; UNIQUE test; END_ENTITY;
 ENTITY unique_label_entity; test : BOOLEAN; UNIQUE UR1 : test; END_ENTITY;
-ENTITY unique_qualified_entity; UNIQUE SELF\attribute_entity.test; END_ENTITY;
-ENTITY unique_label_qualified_entity; UNIQUE UR1 : SELF\attribute_entity.test; END_ENTITY;
+ENTITY unique_redeclared_entity SUBTYPE OF (attribute_entity); UNIQUE SELF\attribute_entity.test; END_ENTITY;
+ENTITY unique_label_redeclared_entity SUBTYPE OF (attribute_entity); UNIQUE UR1 : SELF\attribute_entity.test; END_ENTITY;
 ENTITY where_entity; WHERE TRUE; END_ENTITY;
 ENTITY where_label_entity; WHERE WR1 : TRUE; END_ENTITY;
 
@@ -119,197 +119,205 @@ RULE multiple_shorthand_variable_expression_rule FOR (empty_entity); LOCAL test,
 RULE statement_rule FOR (empty_entity); ; WHERE TRUE; END_RULE;
 RULE where_label_rule FOR (empty_entity); WHERE WR1 : TRUE; END_RULE;
 
--- simple types
-TYPE binary_type = BINARY; END_TYPE;
-TYPE binary_width_type = BINARY (3); END_TYPE;
-TYPE binary_width_fixed_type = BINARY (3) FIXED; END_TYPE;
-TYPE boolean_type = BOOLEAN; END_TYPE;
-TYPE integer_type = INTEGER; END_TYPE;
-TYPE logical_type = LOGICAL; END_TYPE;
-TYPE number_type = NUMBER; END_TYPE;
-TYPE real_type = REAL; END_TYPE;
-TYPE real_precision_type = REAL (3); END_TYPE;
-TYPE string_type = STRING; END_TYPE;
-TYPE string_width_type = STRING (3); END_TYPE;
-TYPE string_width_fixed_type = STRING (3) FIXED; END_TYPE;
+PROCEDURE statements;
+  -- statements
+  PROCEDURE alias_simple_reference_statement; ALIAS test FOR test; ; END_ALIAS; END_PROCEDURE;
+  PROCEDURE alias_group_reference_statement; ALIAS test FOR test\test2; ; END_ALIAS; END_PROCEDURE;
+  PROCEDURE alias_index_reference_statement; ALIAS test FOR test[1]; ; END_ALIAS; END_PROCEDURE;
+  PROCEDURE alias_index2_reference_statement; ALIAS test FOR test[1:9]; ; END_ALIAS; END_PROCEDURE;
+  PROCEDURE alias_attribute_reference_statement; ALIAS test FOR test.test2; ; END_ALIAS; END_PROCEDURE;
+  PROCEDURE assignment_simple_reference_statement; test := TRUE; END_PROCEDURE;
+  PROCEDURE assignment_group_reference_statement; test\test2 := TRUE; END_PROCEDURE;
+  PROCEDURE assignment_index_reference_statement; test[1] := TRUE; END_PROCEDURE;
+  PROCEDURE assignment_index2_reference_statement; test[1:9] := TRUE; END_PROCEDURE;
+  PROCEDURE assignment_attribute_reference_statement; test.test2 := TRUE; END_PROCEDURE;
+  PROCEDURE case_statement; CASE test OF TRUE : ; END_CASE; END_PROCEDURE;
+  PROCEDURE case_multiple_statement; CASE test OF TRUE : ; TRUE : ; END_CASE; END_PROCEDURE;
+  PROCEDURE case_multiple_shorthand_statement; CASE test OF TRUE, TRUE : ; END_CASE; END_PROCEDURE;
+  PROCEDURE case_otherwise_statement; CASE test OF TRUE : ; OTHERWISE : ; END_CASE; END_PROCEDURE;
+  PROCEDURE compound_statement; BEGIN ; END; END_PROCEDURE;
+  PROCEDURE escape_statement; ESCAPE; END_PROCEDURE;
+  PROCEDURE if_statement; IF TRUE THEN ; END_IF; END_PROCEDURE;
+  PROCEDURE if2_statement; IF TRUE THEN ; ; END_IF; END_PROCEDURE;
+  PROCEDURE if_else_statement; IF TRUE THEN ; ELSE ; END_IF; END_PROCEDURE;
+  PROCEDURE if2_else_statement; IF TRUE THEN ; ; ELSE ; END_IF; END_PROCEDURE;
+  PROCEDURE if_else2_statement; IF TRUE THEN ; ELSE ; ; END_IF; END_PROCEDURE;
+  PROCEDURE if2_else2_statement; IF TRUE THEN ; ; ELSE ; ; END_IF; END_PROCEDURE;
+  PROCEDURE null_statement; ; END_PROCEDURE;
+  PROCEDURE call_statement; empty_procedure; END_PROCEDURE;
+  PROCEDURE call_parameter_statement; empty_procedure(TRUE); END_PROCEDURE;
+  PROCEDURE call_parameter2_statement; empty_procedure(TRUE, TRUE); END_PROCEDURE;
+  PROCEDURE call_insert_statement; INSERT(TRUE); END_PROCEDURE;
+  PROCEDURE call_remove_statement; REMOVE(TRUE); END_PROCEDURE;
+  PROCEDURE repeat_statement; REPEAT; ; END_REPEAT; END_PROCEDURE;
+  PROCEDURE repeat_variable_statement; REPEAT test := 1 TO 9; ; END_REPEAT; END_PROCEDURE;
+  PROCEDURE repeat_variable_increment_statement; REPEAT test := 1 TO 9 BY 2; ; END_REPEAT; END_PROCEDURE;
+  PROCEDURE repeat_while_statement; REPEAT WHILE TRUE; ; END_REPEAT; END_PROCEDURE;
+  PROCEDURE repeat_until_statement; REPEAT UNTIL TRUE; ; END_REPEAT; END_PROCEDURE;
+  PROCEDURE return_statement; RETURN; END_PROCEDURE;
+  PROCEDURE return_expression_statement; RETURN (TRUE); END_PROCEDURE;
+  PROCEDURE skip_statement; SKIP; END_PROCEDURE;
+END_PROCEDURE;
 
--- aggregation types
-TYPE array_type = ARRAY [1:9] OF STRING; END_TYPE;
-TYPE array_optional_type = ARRAY [1:9] OF OPTIONAL STRING; END_TYPE;
-TYPE array_unique_type = ARRAY [1:9] OF UNIQUE STRING; END_TYPE;
-TYPE array_optional_unique_type = ARRAY [1:9] OF OPTIONAL UNIQUE STRING; END_TYPE;
-TYPE bag_type = BAG OF STRING; END_TYPE;
-TYPE bag_bound_type = BAG [1:9] OF STRING; END_TYPE;
-TYPE list_type = LIST OF STRING; END_TYPE;
-TYPE list_bound_type = LIST [1:9] OF STRING; END_TYPE;
-TYPE list_unique_type = LIST OF UNIQUE STRING; END_TYPE;
-TYPE list_bound_unique_type = LIST [1:9] OF UNIQUE STRING; END_TYPE;
-TYPE set_type = SET OF STRING; END_TYPE;
-TYPE set_bound_type = SET [1:9] OF STRING; END_TYPE;
+PROCEDURE types;
+  -- simple types
+  TYPE binary_type = BINARY; END_TYPE;
+  TYPE binary_width_type = BINARY (3); END_TYPE;
+  TYPE binary_width_fixed_type = BINARY (3) FIXED; END_TYPE;
+  TYPE boolean_type = BOOLEAN; END_TYPE;
+  TYPE integer_type = INTEGER; END_TYPE;
+  TYPE logical_type = LOGICAL; END_TYPE;
+  TYPE number_type = NUMBER; END_TYPE;
+  TYPE real_type = REAL; END_TYPE;
+  TYPE real_precision_type = REAL (3); END_TYPE;
+  TYPE string_type = STRING; END_TYPE;
+  TYPE string_width_type = STRING (3); END_TYPE;
+  TYPE string_width_fixed_type = STRING (3) FIXED; END_TYPE;
 
--- constructed types
-TYPE select_type = SELECT; END_TYPE;
-TYPE select_extensible_type = EXTENSIBLE SELECT; END_TYPE;
-TYPE select_extensible_generic_entity_type = EXTENSIBLE GENERIC_ENTITY SELECT; END_TYPE;
-TYPE select_list_type = SELECT (empty_type); END_TYPE;
-TYPE select_extension_type_ref_type = SELECT BASED_ON select_type; END_TYPE;
-TYPE select_extension_type_ref_list_type = SELECT BASED_ON select_type WITH (empty_type); END_TYPE;
-TYPE enumeration_type = ENUMERATION; END_TYPE;
-TYPE enumeration_extensible_type = EXTENSIBLE ENUMERATION; END_TYPE;
-TYPE enumeration_list_type = ENUMERATION OF (test); END_TYPE;
-TYPE enumeration_extension_type_ref_type = ENUMERATION BASED_ON enumeration_type; END_TYPE;
-TYPE enumeration_extension_type_ref_list_type = ENUMERATION BASED_ON enumeration_type WITH (test); END_TYPE;
+  -- aggregation types
+  TYPE array_type = ARRAY [1:9] OF STRING; END_TYPE;
+  TYPE array_optional_type = ARRAY [1:9] OF OPTIONAL STRING; END_TYPE;
+  TYPE array_unique_type = ARRAY [1:9] OF UNIQUE STRING; END_TYPE;
+  TYPE array_optional_unique_type = ARRAY [1:9] OF OPTIONAL UNIQUE STRING; END_TYPE;
+  TYPE bag_type = BAG OF STRING; END_TYPE;
+  TYPE bag_bound_type = BAG [1:9] OF STRING; END_TYPE;
+  TYPE list_type = LIST OF STRING; END_TYPE;
+  TYPE list_bound_type = LIST [1:9] OF STRING; END_TYPE;
+  TYPE list_unique_type = LIST OF UNIQUE STRING; END_TYPE;
+  TYPE list_bound_unique_type = LIST [1:9] OF UNIQUE STRING; END_TYPE;
+  TYPE set_type = SET OF STRING; END_TYPE;
+  TYPE set_bound_type = SET [1:9] OF STRING; END_TYPE;
 
--- statements
-FUNCTION alias_simple_reference_statement : BOOLEAN; ALIAS test FOR test; ; END_ALIAS; END_FUNCTION;
-FUNCTION alias_attribute_reference_statement : BOOLEAN; ALIAS test FOR test.test; ; END_ALIAS; END_FUNCTION;
-FUNCTION alias_group_reference_statement : BOOLEAN; ALIAS test FOR test\test; ; END_ALIAS; END_FUNCTION;
-FUNCTION alias_index_reference_statement : BOOLEAN; ALIAS test FOR test[1]; ; END_ALIAS; END_FUNCTION;
-FUNCTION alias_index2_reference_statement : BOOLEAN; ALIAS test FOR test[1:9]; ; END_ALIAS; END_FUNCTION;
-FUNCTION assignment_simple_reference_statement : BOOLEAN; test := TRUE; END_FUNCTION;
-FUNCTION assignment_attribute_reference_statement : BOOLEAN; test.test := TRUE; END_FUNCTION;
-FUNCTION assignment_group_reference_statement : BOOLEAN; test\test := TRUE; END_FUNCTION;
-FUNCTION assignment_index_reference_statement : BOOLEAN; test[1] := TRUE; END_FUNCTION;
-FUNCTION assignment_index2_reference_statement : BOOLEAN; test[1:9] := TRUE; END_FUNCTION;
-FUNCTION case_statement : BOOLEAN; CASE test OF TRUE : ; END_CASE; END_FUNCTION;
-FUNCTION case_multiple_statement : BOOLEAN; CASE test OF TRUE : ; TRUE : ; END_CASE; END_FUNCTION;
-FUNCTION case_multiple_shorthand_statement : BOOLEAN; CASE test OF TRUE, TRUE : ; END_CASE; END_FUNCTION;
-FUNCTION case_otherwise_statement : BOOLEAN; CASE test OF TRUE : ; OTHERWISE : ; END_CASE; END_FUNCTION;
-FUNCTION compound_statement : BOOLEAN; BEGIN ; END; END_FUNCTION;
-FUNCTION escape_statement : BOOLEAN; ESCAPE; END_FUNCTION;
-FUNCTION if_statement : BOOLEAN; IF TRUE THEN ; END_IF; END_FUNCTION;
-FUNCTION if2_statement : BOOLEAN; IF TRUE THEN ; ; END_IF; END_FUNCTION;
-FUNCTION if_else_statement : BOOLEAN; IF TRUE THEN ; ELSE ; END_IF; END_FUNCTION;
-FUNCTION if2_else_statement : BOOLEAN; IF TRUE THEN ; ; ELSE ; END_IF; END_FUNCTION;
-FUNCTION if_else2_statement : BOOLEAN; IF TRUE THEN ; ELSE ; ; END_IF; END_FUNCTION;
-FUNCTION if2_else2_statement : BOOLEAN; IF TRUE THEN ; ; ELSE ; ; END_IF; END_FUNCTION;
-FUNCTION null_statement : BOOLEAN; ; END_FUNCTION;
-FUNCTION call_statement : BOOLEAN; empty_procedure; END_FUNCTION;
-FUNCTION call_parameter_statement : BOOLEAN; empty_procedure(TRUE); END_FUNCTION;
-FUNCTION call_parameter2_statement : BOOLEAN; empty_procedure(TRUE, TRUE); END_FUNCTION;
-FUNCTION call_insert_statement : BOOLEAN; INSERT(TRUE); END_FUNCTION;
-FUNCTION call_remove_statement : BOOLEAN; REMOVE(TRUE); END_FUNCTION;
-FUNCTION repeat_statement : BOOLEAN; REPEAT; ; END_REPEAT; END_FUNCTION;
-FUNCTION repeat_variable_statement : BOOLEAN; REPEAT test := 1 TO 9; ; END_REPEAT; END_FUNCTION;
-FUNCTION repeat_variable_increment_statement : BOOLEAN; REPEAT test := 1 TO 9 BY 2; ; END_REPEAT; END_FUNCTION;
-FUNCTION repeat_while_statement : BOOLEAN; REPEAT WHILE TRUE; ; END_REPEAT; END_FUNCTION;
-FUNCTION repeat_until_statement : BOOLEAN; REPEAT UNTIL TRUE; ; END_REPEAT; END_FUNCTION;
-FUNCTION return_statement : BOOLEAN; RETURN; END_FUNCTION;
-FUNCTION return_expression_statement : BOOLEAN; RETURN (TRUE); END_FUNCTION;
-FUNCTION skip_statement : BOOLEAN; SKIP; END_FUNCTION;
+  -- constructed types
+  TYPE select_type = SELECT; END_TYPE;
+  TYPE select_extensible_type = EXTENSIBLE SELECT; END_TYPE;
+  TYPE select_extensible_generic_entity_type = EXTENSIBLE GENERIC_ENTITY SELECT; END_TYPE;
+  TYPE select_list_type = SELECT (empty_type); END_TYPE;
+  TYPE select_extension_type_ref_type = SELECT BASED_ON select_type; END_TYPE;
+  TYPE select_extension_type_ref_list_type = SELECT BASED_ON select_type WITH (empty_type); END_TYPE;
+  TYPE enumeration_type = ENUMERATION; END_TYPE;
+  TYPE enumeration_extensible_type = EXTENSIBLE ENUMERATION; END_TYPE;
+  TYPE enumeration_list_type = ENUMERATION OF (test); END_TYPE;
+  TYPE enumeration_extension_type_ref_type = ENUMERATION BASED_ON enumeration_type; END_TYPE;
+  TYPE enumeration_extension_type_ref_list_type = ENUMERATION BASED_ON enumeration_type WITH (test); END_TYPE;
+END_PROCEDURE;
 
--- literal expressions
-FUNCTION binary_expression : BOOLEAN; RETURN (%011110000111100001111000); END_FUNCTION;
-FUNCTION integer_expression : BOOLEAN; RETURN (999); END_FUNCTION;
-FUNCTION true_logical_expression : BOOLEAN; RETURN (TRUE); END_FUNCTION;
-FUNCTION false_logical_expression : BOOLEAN; RETURN (FALSE); END_FUNCTION;
-FUNCTION unknown_logical_expression : BOOLEAN; RETURN (UNKNOWN); END_FUNCTION;
-FUNCTION real_expression : BOOLEAN; RETURN (999.999); END_FUNCTION;
-FUNCTION simple_string_expression : BOOLEAN; RETURN ('xxx'); END_FUNCTION;
-FUNCTION utf8_simple_string_expression : BOOLEAN; RETURN ('UTF8 test: Příliš žluťoučký kůň úpěl ďábelské ódy.'); END_FUNCTION;
-FUNCTION encoded_string_expression : BOOLEAN; RETURN ("000000780000007800000078"); END_FUNCTION;
+PROCEDURE expressions;
+  LOCAL
+    -- literal expressions
+    binary_expression : BOOLEAN := %011110000111100001111000;
+    integer_expression : BOOLEAN := 999;
+    true_logical_expression : BOOLEAN := TRUE;
+    false_logical_expression : BOOLEAN := FALSE;
+    unknown_logical_expression : BOOLEAN := UNKNOWN;
+    real_expression : BOOLEAN := 999.999;
+    simple_string_expression : BOOLEAN := 'xxx';
+    utf8_simple_string_expression : BOOLEAN := 'UTF8 test: Příliš žluťoučký kůň úpěl ďábelské ódy.';
+    encoded_string_expression : BOOLEAN := "000000780000007800000078";
 
--- constant expressions
-FUNCTION const_e_expression : BOOLEAN; RETURN (CONST_E); END_FUNCTION;
-FUNCTION indeterminate_expression : BOOLEAN; RETURN (?); END_FUNCTION;
-FUNCTION pi_expression : BOOLEAN; RETURN (PI); END_FUNCTION;
-FUNCTION self_expression : BOOLEAN; RETURN (SELF); END_FUNCTION;
+    -- constant expressions
+    const_e_expression : BOOLEAN := CONST_E;
+    indeterminate_expression : BOOLEAN := ?;
+    pi_expression : BOOLEAN := PI;
+    self_expression : BOOLEAN := SELF;
 
--- function expressions
-FUNCTION abs_expression : BOOLEAN; RETURN (ABS(TRUE)); END_FUNCTION;
-FUNCTION acos_expression : BOOLEAN; RETURN (ACOS(TRUE)); END_FUNCTION;
-FUNCTION asin_expression : BOOLEAN; RETURN (ASIN(TRUE)); END_FUNCTION;
-FUNCTION atan_expression : BOOLEAN; RETURN (ATAN(TRUE)); END_FUNCTION;
-FUNCTION blength_expression : BOOLEAN; RETURN (BLENGTH(TRUE)); END_FUNCTION;
-FUNCTION cos_expression : BOOLEAN; RETURN (COS(TRUE)); END_FUNCTION;
-FUNCTION exists_expression : BOOLEAN; RETURN (EXISTS(TRUE)); END_FUNCTION;
-FUNCTION exp_expression : BOOLEAN; RETURN (EXP(TRUE)); END_FUNCTION;
-FUNCTION format_expression : BOOLEAN; RETURN (FORMAT(TRUE)); END_FUNCTION;
-FUNCTION hibound_expression : BOOLEAN; RETURN (HIBOUND(TRUE)); END_FUNCTION;
-FUNCTION hiindex_expression : BOOLEAN; RETURN (HIINDEX(TRUE)); END_FUNCTION;
-FUNCTION length_expression : BOOLEAN; RETURN (LENGTH(TRUE)); END_FUNCTION;
-FUNCTION lobound_expression : BOOLEAN; RETURN (LOBOUND(TRUE)); END_FUNCTION;
-FUNCTION loindex_expression : BOOLEAN; RETURN (LOINDEX(TRUE)); END_FUNCTION;
-FUNCTION log_expression : BOOLEAN; RETURN (LOG(TRUE)); END_FUNCTION;
-FUNCTION log2_expression : BOOLEAN; RETURN (LOG2(TRUE)); END_FUNCTION;
-FUNCTION log10_expression : BOOLEAN; RETURN (LOG10(TRUE)); END_FUNCTION;
-FUNCTION nvl_expression : BOOLEAN; RETURN (NVL(TRUE)); END_FUNCTION;
-FUNCTION odd_expression : BOOLEAN; RETURN (ODD(TRUE)); END_FUNCTION;
-FUNCTION rolesof_expression : BOOLEAN; RETURN (ROLESOF(TRUE)); END_FUNCTION;
-FUNCTION sin_expression : BOOLEAN; RETURN (SIN(TRUE)); END_FUNCTION;
-FUNCTION sizeof_expression : BOOLEAN; RETURN (SIZEOF(TRUE)); END_FUNCTION;
-FUNCTION sqrt_expression : BOOLEAN; RETURN (SQRT(TRUE)); END_FUNCTION;
-FUNCTION tan_expression : BOOLEAN; RETURN (TAN(TRUE)); END_FUNCTION;
-FUNCTION typeof_expression : BOOLEAN; RETURN (TYPEOF(TRUE)); END_FUNCTION;
-FUNCTION usedin_expression : BOOLEAN; RETURN (USEDIN(TRUE)); END_FUNCTION;
-FUNCTION value_expression : BOOLEAN; RETURN (VALUE(TRUE)); END_FUNCTION;
-FUNCTION value_in_expression : BOOLEAN; RETURN (VALUE_IN(TRUE)); END_FUNCTION;
-FUNCTION value_unique_expression : BOOLEAN; RETURN (VALUE_UNIQUE(TRUE)); END_FUNCTION;
+    -- function expressions
+    abs_expression : BOOLEAN := ABS(TRUE);
+    acos_expression : BOOLEAN := ACOS(TRUE);
+    asin_expression : BOOLEAN := ASIN(TRUE);
+    atan_expression : BOOLEAN := ATAN(TRUE);
+    blength_expression : BOOLEAN := BLENGTH(TRUE);
+    cos_expression : BOOLEAN := COS(TRUE);
+    exists_expression : BOOLEAN := EXISTS(TRUE);
+    exp_expression : BOOLEAN := EXP(TRUE);
+    format_expression : BOOLEAN := FORMAT(TRUE);
+    hibound_expression : BOOLEAN := HIBOUND(TRUE);
+    hiindex_expression : BOOLEAN := HIINDEX(TRUE);
+    length_expression : BOOLEAN := LENGTH(TRUE);
+    lobound_expression : BOOLEAN := LOBOUND(TRUE);
+    loindex_expression : BOOLEAN := LOINDEX(TRUE);
+    log_expression : BOOLEAN := LOG(TRUE);
+    log2_expression : BOOLEAN := LOG2(TRUE);
+    log10_expression : BOOLEAN := LOG10(TRUE);
+    nvl_expression : BOOLEAN := NVL(TRUE);
+    odd_expression : BOOLEAN := ODD(TRUE);
+    rolesof_expression : BOOLEAN := ROLESOF(TRUE);
+    sin_expression : BOOLEAN := SIN(TRUE);
+    sizeof_expression : BOOLEAN := SIZEOF(TRUE);
+    sqrt_expression : BOOLEAN := SQRT(TRUE);
+    tan_expression : BOOLEAN := TAN(TRUE);
+    typeof_expression : BOOLEAN := TYPEOF(TRUE);
+    usedin_expression : BOOLEAN := USEDIN(TRUE);
+    value_expression : BOOLEAN := VALUE(TRUE);
+    value_in_expression : BOOLEAN := VALUE_IN(TRUE);
+    value_unique_expression : BOOLEAN := VALUE_UNIQUE(TRUE);
 
--- operator expressions
-FUNCTION plus_expression : BOOLEAN; RETURN (+4); END_FUNCTION;
-FUNCTION plus_addition_expression : BOOLEAN; RETURN (+(4 + 2)); END_FUNCTION;
-FUNCTION minus_expression : BOOLEAN; RETURN (-4); END_FUNCTION;
-FUNCTION minus_addition_expression : BOOLEAN; RETURN (-(4 + 2)); END_FUNCTION;
-FUNCTION addition_expression : BOOLEAN; RETURN (4 + 2); END_FUNCTION;
-FUNCTION subtraction_expression : BOOLEAN; RETURN (4 - 2); END_FUNCTION;
-FUNCTION multiplication_expression : BOOLEAN; RETURN (4 * 2); END_FUNCTION;
-FUNCTION real_division_expression : BOOLEAN; RETURN (4 / 2); END_FUNCTION;
-FUNCTION integer_division_expression : BOOLEAN; RETURN (4 DIV 2); END_FUNCTION;
-FUNCTION modulo_expression : BOOLEAN; RETURN (4 MOD 2); END_FUNCTION;
-FUNCTION exponentiation_expression : BOOLEAN; RETURN (4 ** 2); END_FUNCTION;
-FUNCTION addition_addition_expression : BOOLEAN; RETURN (4 + 2 + 1); END_FUNCTION;
-FUNCTION subtraction_subtraction_expression : BOOLEAN; RETURN (4 - 2 - 1); END_FUNCTION;
-FUNCTION addition_subtraction_expression : BOOLEAN; RETURN (4 + 2 - 1); END_FUNCTION;
-FUNCTION subtraction_addition_expression : BOOLEAN; RETURN (4 - 2 + 1); END_FUNCTION;
-FUNCTION addition_multiplication_expression : BOOLEAN; RETURN (8 + 4 * 2); END_FUNCTION;
-FUNCTION multiplication_addition_expression : BOOLEAN; RETURN (8 * 4 + 2); END_FUNCTION;
-FUNCTION parenthesis_addition_multiplication_expression : BOOLEAN; RETURN ((8 + 4) * 2); END_FUNCTION;
-FUNCTION multiplication_parenthesis_addition_expression : BOOLEAN; RETURN (8 * (4 + 2)); END_FUNCTION;
-FUNCTION equal_expression : BOOLEAN; RETURN (4 = 2); END_FUNCTION;
-FUNCTION not_equal_expression : BOOLEAN; RETURN (4 <> 2); END_FUNCTION;
-FUNCTION instance_equal_expression : BOOLEAN; RETURN (4 :=: 2); END_FUNCTION;
-FUNCTION instance_not_equal_expression : BOOLEAN; RETURN (4 :<>: 2); END_FUNCTION;
-FUNCTION lt_expression : BOOLEAN; RETURN (4 < 2); END_FUNCTION;
-FUNCTION gt_expression : BOOLEAN; RETURN (4 > 2); END_FUNCTION;
-FUNCTION lte_expression : BOOLEAN; RETURN (4 <= 2); END_FUNCTION;
-FUNCTION gte_expression : BOOLEAN; RETURN (4 >= 2); END_FUNCTION;
-FUNCTION not_expression : BOOLEAN; RETURN (NOT TRUE); END_FUNCTION;
-FUNCTION not_or_expression : BOOLEAN; RETURN (NOT (TRUE OR FALSE)); END_FUNCTION;
-FUNCTION or_expression : BOOLEAN; RETURN (TRUE OR FALSE); END_FUNCTION;
-FUNCTION and_expression : BOOLEAN; RETURN (TRUE AND FALSE); END_FUNCTION;
-FUNCTION or_or_expression : BOOLEAN; RETURN (TRUE OR FALSE OR TRUE); END_FUNCTION;
-FUNCTION and_and_expression : BOOLEAN; RETURN (TRUE AND FALSE AND TRUE); END_FUNCTION;
-FUNCTION or_and_expression : BOOLEAN; RETURN (TRUE OR FALSE AND TRUE); END_FUNCTION;
-FUNCTION and_or_expression : BOOLEAN; RETURN (TRUE AND FALSE OR TRUE); END_FUNCTION;
-FUNCTION parenthesis_or_and_expression : BOOLEAN; RETURN ((TRUE OR FALSE) AND TRUE); END_FUNCTION;
-FUNCTION and_parenthesis_or_expression : BOOLEAN; RETURN (TRUE AND (FALSE OR TRUE)); END_FUNCTION;
-FUNCTION combine_expression : BOOLEAN; RETURN (test || test); END_FUNCTION;
-FUNCTION in_expression : BOOLEAN; RETURN (TRUE IN [TRUE]); END_FUNCTION;
-FUNCTION like_expression : BOOLEAN; RETURN ('xxx' LIKE 'xxx'); END_FUNCTION;
+    -- operator expressions
+    plus_expression : BOOLEAN := +4;
+    plus_addition_expression : BOOLEAN := +(4 + 2);
+    minus_expression : BOOLEAN := -4;
+    minus_addition_expression : BOOLEAN := -(4 + 2);
+    addition_expression : BOOLEAN := 4 + 2;
+    subtraction_expression : BOOLEAN := 4 - 2;
+    multiplication_expression : BOOLEAN := 4 * 2;
+    real_division_expression : BOOLEAN := 4 / 2;
+    integer_division_expression : BOOLEAN := 4 DIV 2;
+    modulo_expression : BOOLEAN := 4 MOD 2;
+    exponentiation_expression : BOOLEAN := 4 ** 2;
+    addition_addition_expression : BOOLEAN := 4 + 2 + 1;
+    subtraction_subtraction_expression : BOOLEAN := 4 - 2 - 1;
+    addition_subtraction_expression : BOOLEAN := 4 + 2 - 1;
+    subtraction_addition_expression : BOOLEAN := 4 - 2 + 1;
+    addition_multiplication_expression : BOOLEAN := 8 + 4 * 2;
+    multiplication_addition_expression : BOOLEAN := 8 * 4 + 2;
+    parenthesis_addition_multiplication_expression : BOOLEAN := (8 + 4) * 2;
+    multiplication_parenthesis_addition_expression : BOOLEAN := 8 * (4 + 2);
+    equal_expression : BOOLEAN := 4 = 2;
+    not_equal_expression : BOOLEAN := 4 <> 2;
+    instance_equal_expression : BOOLEAN := 4 :=: 2;
+    instance_not_equal_expression : BOOLEAN := 4 :<>: 2;
+    lt_expression : BOOLEAN := 4 < 2;
+    gt_expression : BOOLEAN := 4 > 2;
+    lte_expression : BOOLEAN := 4 <= 2;
+    gte_expression : BOOLEAN := 4 >= 2;
+    not_expression : BOOLEAN := NOT TRUE;
+    not_or_expression : BOOLEAN := NOT (TRUE OR FALSE);
+    or_expression : BOOLEAN := TRUE OR FALSE;
+    and_expression : BOOLEAN := TRUE AND FALSE;
+    or_or_expression : BOOLEAN := TRUE OR FALSE OR TRUE;
+    and_and_expression : BOOLEAN := TRUE AND FALSE AND TRUE;
+    or_and_expression : BOOLEAN := TRUE OR FALSE AND TRUE;
+    and_or_expression : BOOLEAN := TRUE AND FALSE OR TRUE;
+    parenthesis_or_and_expression : BOOLEAN := (TRUE OR FALSE) AND TRUE;
+    and_parenthesis_or_expression : BOOLEAN := TRUE AND (FALSE OR TRUE);
+    combine_expression : BOOLEAN := test || test2;
+    in_expression : BOOLEAN := TRUE IN [TRUE];
+    like_expression : BOOLEAN := 'xxx' LIKE 'xxx';
 
--- aggregate initializer expressions
-FUNCTION aggregate_initializer_expression : BOOLEAN; RETURN ([4]); END_FUNCTION;
-FUNCTION repeated_aggregate_initializer_expression : BOOLEAN; RETURN ([4:2]); END_FUNCTION;
-FUNCTION complex_aggregate_initializer_expression : BOOLEAN; RETURN ([4 + 2]); END_FUNCTION;
-FUNCTION complex_repeated_aggregate_initializer_expression : BOOLEAN; RETURN ([4 + 2:4 + 2]); END_FUNCTION;
+    -- aggregate initializer expressions
+    aggregate_initializer_expression : BOOLEAN := [4];
+    repeated_aggregate_initializer_expression : BOOLEAN := [4:2];
+    complex_aggregate_initializer_expression : BOOLEAN := [4 + 2];
+    complex_repeated_aggregate_initializer_expression : BOOLEAN := [4 + 2:4 + 2];
 
--- function call or entity constructor expressions
-FUNCTION call_expression : BOOLEAN; RETURN (parameter_function(TRUE)); END_FUNCTION;
+    -- function call or entity constructor expressions
+    call_expression : BOOLEAN := parameter_function(TRUE);
 
--- reference expressions
-FUNCTION simple_reference_expression : BOOLEAN; RETURN (simple_string_expression); END_FUNCTION;
-FUNCTION attribute_reference_expression : BOOLEAN; RETURN (simple_string_expression.test); END_FUNCTION;
-FUNCTION group_reference_expression : BOOLEAN; RETURN (simple_string_expression\test); END_FUNCTION;
-FUNCTION index_reference_expression : BOOLEAN; RETURN (simple_string_expression[1]); END_FUNCTION;
-FUNCTION index2_reference_expression : BOOLEAN; RETURN (simple_string_expression[1:9]); END_FUNCTION;
+    -- reference expressions
+    simple_reference_expression : BOOLEAN := test;
+    group_reference_expression : BOOLEAN := test\test2;
+    index_reference_expression : BOOLEAN := test[1];
+    index2_reference_expression : BOOLEAN := test[1:9];
+    attribute_reference_expression : BOOLEAN := test.test2;
 
--- interval expressions
-FUNCTION lt_lt_interval_expression : BOOLEAN; RETURN ({1 < 5 < 9}); END_FUNCTION;
-FUNCTION lte_lt_interval_expression : BOOLEAN; RETURN ({1 <= 5 < 9}); END_FUNCTION;
-FUNCTION lt_lte_interval_expression : BOOLEAN; RETURN ({1 < 5 <= 9}); END_FUNCTION;
-FUNCTION lte_lte_interval_expression : BOOLEAN; RETURN ({1 <= 5 <= 9}); END_FUNCTION;
+    -- interval expressions
+    lt_lt_interval_expression : BOOLEAN := {1 < 5 < 9};
+    lte_lt_interval_expression : BOOLEAN := {1 <= 5 < 9};
+    lt_lte_interval_expression : BOOLEAN := {1 < 5 <= 9};
+    lte_lte_interval_expression : BOOLEAN := {1 <= 5 <= 9};
 
--- query expressions
-FUNCTION query_expression : BOOLEAN; RETURN (QUERY(test <* test2 | TRUE)); END_FUNCTION;
+    -- query expressions
+    query_expression : BOOLEAN := QUERY(test <* test2 | TRUE);
+  END_LOCAL;
+END_PROCEDURE;
 END_SCHEMA;