expressir 1.2.4 → 1.2.5

data/ext/express-parser/express_parser.cpp

@@ -15,7 +15,6 @@
 #undef OUT
 #endif
 
-// ruby-3.0
 #undef FALSE
 #undef TRUE
 
@@ -25,8 +24,6 @@ using namespace std;
 using namespace Rice;
 using namespace antlr4;
 
-Module rb_mExpressParser;
-
 Class rb_cAttributeRefContext;
 Class rb_cAttributeIdContext;
 Class rb_cConstantRefContext;
@@ -237,7 +234,7 @@ namespace Rice::detail {
   class To_Ruby<Token*> {
   public:
     VALUE convert(Token* const &x) {
-      if (!x) return Qnil;
+      if (!x) return Nil;
       return Data_Object<Token>(x, false, rb_cToken);
     }
   };
@@ -246,7 +243,7 @@ namespace Rice::detail {
   class To_Ruby<tree::ParseTree*> {
   public:
     VALUE convert(tree::ParseTree* const &x) {
-      if (!x) return Qnil;
+      if (!x) return Nil;
       return Data_Object<tree::ParseTree>(x, false, rb_cParseTree);
     }
   };
@@ -255,7 +252,7 @@ namespace Rice::detail {
   class To_Ruby<tree::TerminalNode*> {
   public:
     VALUE convert(tree::TerminalNode* const &x) {
-      if (!x) return Qnil;
+      if (!x) return Nil;
       return Data_Object<tree::TerminalNode>(x, false, rb_cTerminalNode);
     }
   };
@@ -277,24 +274,22 @@ public:
 
   Object getStart() {
     auto token = ((ParserRuleContext*) orig) -> getStart();
+
     return detail::To_Ruby<Token*>().convert(token);
   }
 
   Object getStop() {
     auto token = ((ParserRuleContext*) orig) -> getStop();
+
     return detail::To_Ruby<Token*>().convert(token);
   }
 
   Array getChildren() {
-// Note re memory management
-// It looks like it is critical to 'fill' children array each time when this method is called
-// When Ruby GC collects the array it also unmarks all its elements so it is not possible to reuse them
-// (without custom mark function ????)
-// This comment also applies to all methods returning Ruby Arrays below
     Array children;
     if (orig != nullptr) {
       for (auto it = orig -> children.begin(); it != orig -> children.end(); it ++) {
         Object parseTree = ContextProxy::wrapParseTree(*it);
+
         if (parseTree != Nil) {
           children.push(parseTree);
         }
@@ -304,12 +299,11 @@ public:
   }
 
   Object getParent() {
-    return orig == nullptr ? Nil: wrapParseTree(orig -> parent) ;
+    return orig == nullptr ? Nil : ContextProxy::wrapParseTree(orig -> parent);
   }
 
   size_t childCount() {
-
-    return getChildren().size();
+    return orig == nullptr ? 0 : orig -> children.size();
   }
 
   bool doubleEquals(Object other) {
@@ -338,11 +332,13 @@ class AttributeRefContextProxy : public ContextProxy {
 public:
   AttributeRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object attributeId();
+
 };
 
 class AttributeIdContextProxy : public ContextProxy {
 public:
   AttributeIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -350,11 +346,13 @@ class ConstantRefContextProxy : public ContextProxy {
 public:
   ConstantRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object constantId();
+
 };
 
 class ConstantIdContextProxy : public ContextProxy {
 public:
   ConstantIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -362,11 +360,13 @@ class EntityRefContextProxy : public ContextProxy {
 public:
   EntityRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object entityId();
+
 };
 
 class EntityIdContextProxy : public ContextProxy {
 public:
   EntityIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -374,11 +374,13 @@ class EnumerationRefContextProxy : public ContextProxy {
 public:
   EnumerationRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object enumerationId();
+
 };
 
 class EnumerationIdContextProxy : public ContextProxy {
 public:
   EnumerationIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -386,11 +388,13 @@ class FunctionRefContextProxy : public ContextProxy {
 public:
   FunctionRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object functionId();
+
 };
 
 class FunctionIdContextProxy : public ContextProxy {
 public:
   FunctionIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -398,11 +402,13 @@ class ParameterRefContextProxy : public ContextProxy {
 public:
   ParameterRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object parameterId();
+
 };
 
 class ParameterIdContextProxy : public ContextProxy {
 public:
   ParameterIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -410,11 +416,13 @@ class ProcedureRefContextProxy : public ContextProxy {
 public:
   ProcedureRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object procedureId();
+
 };
 
 class ProcedureIdContextProxy : public ContextProxy {
 public:
   ProcedureIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -422,11 +430,13 @@ class RuleLabelRefContextProxy : public ContextProxy {
 public:
   RuleLabelRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object ruleLabelId();
+
 };
 
 class RuleLabelIdContextProxy : public ContextProxy {
 public:
   RuleLabelIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -434,11 +444,13 @@ class RuleRefContextProxy : public ContextProxy {
 public:
   RuleRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object ruleId();
+
 };
 
 class RuleIdContextProxy : public ContextProxy {
 public:
   RuleIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -446,11 +458,13 @@ class SchemaRefContextProxy : public ContextProxy {
 public:
   SchemaRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object schemaId();
+
 };
 
 class SchemaIdContextProxy : public ContextProxy {
 public:
   SchemaIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -458,11 +472,13 @@ class SubtypeConstraintRefContextProxy : public ContextProxy {
 public:
   SubtypeConstraintRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object subtypeConstraintId();
+
 };
 
 class SubtypeConstraintIdContextProxy : public ContextProxy {
 public:
   SubtypeConstraintIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -470,11 +486,13 @@ class TypeLabelRefContextProxy : public ContextProxy {
 public:
   TypeLabelRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object typeLabelId();
+
 };
 
 class TypeLabelIdContextProxy : public ContextProxy {
 public:
   TypeLabelIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -482,11 +500,13 @@ class TypeRefContextProxy : public ContextProxy {
 public:
   TypeRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object typeId();
+
 };
 
 class TypeIdContextProxy : public ContextProxy {
 public:
   TypeIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
@@ -494,23 +514,27 @@ class VariableRefContextProxy : public ContextProxy {
 public:
   VariableRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object variableId();
+
 };
 
 class VariableIdContextProxy : public ContextProxy {
 public:
   VariableIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleId();
 };
 
 class AbstractEntityDeclarationContextProxy : public ContextProxy {
 public:
   AbstractEntityDeclarationContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object ABSTRACT();
 };
 
 class AbstractSupertypeContextProxy : public ContextProxy {
 public:
   AbstractSupertypeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object ABSTRACT();
   Object SUPERTYPE();
 };
@@ -535,17 +559,20 @@ public:
   ActualParameterListContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object parameter();
   Object parameterAt(size_t i);
+
 };
 
 class ParameterContextProxy : public ContextProxy {
 public:
   ParameterContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object expression();
+
 };
 
 class AddLikeOpContextProxy : public ContextProxy {
 public:
   AddLikeOpContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object OR();
   Object XOR();
 };
@@ -555,6 +582,7 @@ public:
   AggregateInitializerContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object element();
   Object elementAt(size_t i);
+
 };
 
 class ElementContextProxy : public ContextProxy {
@@ -562,12 +590,14 @@ public:
   ElementContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object expression();
   Object repetition();
+
 };
 
 class AggregateSourceContextProxy : public ContextProxy {
 public:
   AggregateSourceContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object simpleExpression();
+
 };
 
 class SimpleExpressionContextProxy : public ContextProxy {
@@ -577,6 +607,7 @@ public:
   Object termAt(size_t i);
   Object addLikeOp();
   Object addLikeOpAt(size_t i);
+
 };
 
 class AggregateTypeContextProxy : public ContextProxy {
@@ -594,6 +625,7 @@ public:
   Object generalizedTypes();
   Object namedTypes();
   Object simpleTypes();
+
 };
 
 class TypeLabelContextProxy : public ContextProxy {
@@ -601,6 +633,7 @@ public:
   TypeLabelContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object typeLabelId();
   Object typeLabelRef();
+
 };
 
 class AggregationTypesContextProxy : public ContextProxy {
@@ -610,6 +643,7 @@ public:
   Object bagType();
   Object listType();
   Object setType();
+
 };
 
 class ArrayTypeContextProxy : public ContextProxy {
@@ -658,6 +692,7 @@ public:
   Object declarationAt(size_t i);
   Object constantDecl();
   Object localDecl();
+
 };
 
 class DeclarationContextProxy : public ContextProxy {
@@ -668,6 +703,7 @@ public:
   Object procedureDecl();
   Object subtypeConstraintDecl();
   Object typeDecl();
+
 };
 
 class ConstantDeclContextProxy : public ContextProxy {
@@ -707,6 +743,7 @@ public:
   GeneralRefContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object parameterRef();
   Object variableId();
+
 };
 
 class StmtContextProxy : public ContextProxy {
@@ -723,6 +760,7 @@ public:
   Object repeatStmt();
   Object returnStmt();
   Object skipStmt();
+
 };
 
 class QualifierContextProxy : public ContextProxy {
@@ -731,6 +769,7 @@ public:
   Object attributeQualifier();
   Object groupQualifier();
   Object indexQualifier();
+
 };
 
 class BoundSpecContextProxy : public ContextProxy {
@@ -738,6 +777,7 @@ public:
   BoundSpecContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object bound1();
   Object bound2();
+
 };
 
 class InstantiableTypeContextProxy : public ContextProxy {
@@ -745,6 +785,7 @@ public:
   InstantiableTypeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object concreteTypes();
   Object entityRef();
+
 };
 
 class AssignmentStmtContextProxy : public ContextProxy {
@@ -754,6 +795,7 @@ public:
   Object expression();
   Object qualifier();
   Object qualifierAt(size_t i);
+
 };
 
 class ExpressionContextProxy : public ContextProxy {
@@ -762,6 +804,7 @@ public:
   Object simpleExpression();
   Object simpleExpressionAt(size_t i);
   Object relOpExtended();
+
 };
 
 class AttributeDeclContextProxy : public ContextProxy {
@@ -769,6 +812,7 @@ public:
   AttributeDeclContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object attributeId();
   Object redeclaredAttribute();
+
 };
 
 class RedeclaredAttributeContextProxy : public ContextProxy {
@@ -783,6 +827,7 @@ class AttributeQualifierContextProxy : public ContextProxy {
 public:
   AttributeQualifierContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object attributeRef();
+
 };
 
 class BinaryTypeContextProxy : public ContextProxy {
@@ -802,6 +847,7 @@ public:
 class BooleanTypeContextProxy : public ContextProxy {
 public:
   BooleanTypeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object BOOLEAN();
 };
 
@@ -809,23 +855,27 @@ class Bound1ContextProxy : public ContextProxy {
 public:
   Bound1ContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object numericExpression();
+
 };
 
 class NumericExpressionContextProxy : public ContextProxy {
 public:
   NumericExpressionContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object simpleExpression();
+
 };
 
 class Bound2ContextProxy : public ContextProxy {
 public:
   Bound2ContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object numericExpression();
+
 };
 
 class BuiltInConstantContextProxy : public ContextProxy {
 public:
   BuiltInConstantContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object CONST_E();
   Object PI();
   Object SELF();
@@ -834,6 +884,7 @@ public:
 class BuiltInFunctionContextProxy : public ContextProxy {
 public:
   BuiltInFunctionContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object ABS();
   Object ACOS();
   Object ASIN();
@@ -868,6 +919,7 @@ public:
 class BuiltInProcedureContextProxy : public ContextProxy {
 public:
   BuiltInProcedureContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object INSERT();
   Object REMOVE();
 };
@@ -878,12 +930,14 @@ public:
   Object caseLabel();
   Object caseLabelAt(size_t i);
   Object stmt();
+
 };
 
 class CaseLabelContextProxy : public ContextProxy {
 public:
   CaseLabelContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object expression();
+
 };
 
 class CaseStmtContextProxy : public ContextProxy {
@@ -903,6 +957,7 @@ class SelectorContextProxy : public ContextProxy {
 public:
   SelectorContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object expression();
+
 };
 
 class CompoundStmtContextProxy : public ContextProxy {
@@ -920,6 +975,7 @@ public:
   Object aggregationTypes();
   Object simpleTypes();
   Object typeRef();
+
 };
 
 class SimpleTypesContextProxy : public ContextProxy {
@@ -941,6 +997,7 @@ public:
   Object constantId();
   Object instantiableType();
   Object expression();
+
 };
 
 class ConstantFactorContextProxy : public ContextProxy {
@@ -948,6 +1005,7 @@ public:
   ConstantFactorContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object builtInConstant();
   Object constantRef();
+
 };
 
 class ConstructedTypesContextProxy : public ContextProxy {
@@ -955,6 +1013,7 @@ public:
   ConstructedTypesContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object enumerationType();
   Object selectType();
+
 };
 
 class EnumerationTypeContextProxy : public ContextProxy {
@@ -1029,6 +1088,7 @@ public:
   Object attributeDecl();
   Object parameterType();
   Object expression();
+
 };
 
 class DeriveClauseContextProxy : public ContextProxy {
@@ -1051,6 +1111,7 @@ class RepetitionContextProxy : public ContextProxy {
 public:
   RepetitionContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object numericExpression();
+
 };
 
 class EntityBodyContextProxy : public ContextProxy {
@@ -1062,6 +1123,7 @@ public:
   Object inverseClause();
   Object uniqueClause();
   Object whereClause();
+
 };
 
 class ExplicitAttrContextProxy : public ContextProxy {
@@ -1103,6 +1165,7 @@ public:
   Object entityRef();
   Object expression();
   Object expressionAt(size_t i);
+
 };
 
 class EntityHeadContextProxy : public ContextProxy {
@@ -1118,6 +1181,7 @@ public:
   SubsuperContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object supertypeConstraint();
   Object subtypeDeclaration();
+
 };
 
 class EnumerationExtensionContextProxy : public ContextProxy {
@@ -1134,12 +1198,14 @@ public:
   EnumerationItemsContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object enumerationItem();
   Object enumerationItemAt(size_t i);
+
 };
 
 class EnumerationItemContextProxy : public ContextProxy {
 public:
   EnumerationItemContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object enumerationId();
+
 };
 
 class EnumerationReferenceContextProxy : public ContextProxy {
@@ -1147,11 +1213,13 @@ public:
   EnumerationReferenceContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object enumerationRef();
   Object typeRef();
+
 };
 
 class EscapeStmtContextProxy : public ContextProxy {
 public:
   EscapeStmtContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object ESCAPE();
 };
 
@@ -1168,6 +1236,7 @@ public:
   FactorContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object simpleFactor();
   Object simpleFactorAt(size_t i);
+
 };
 
 class SimpleFactorContextProxy : public ContextProxy {
@@ -1180,6 +1249,7 @@ public:
   Object queryExpression();
   Object simpleFactorExpression();
   Object simpleFactorUnaryExpression();
+
 };
 
 class FormalParameterContextProxy : public ContextProxy {
@@ -1188,6 +1258,7 @@ public:
   Object parameterId();
   Object parameterIdAt(size_t i);
   Object parameterType();
+
 };
 
 class FunctionCallContextProxy : public ContextProxy {
@@ -1196,6 +1267,7 @@ public:
   Object builtInFunction();
   Object functionRef();
   Object actualParameterList();
+
 };
 
 class FunctionHeadContextProxy : public ContextProxy {
@@ -1215,6 +1287,7 @@ public:
   Object generalAggregationTypes();
   Object genericEntityType();
   Object genericType();
+
 };
 
 class GeneralAggregationTypesContextProxy : public ContextProxy {
@@ -1224,6 +1297,7 @@ public:
   Object generalBagType();
   Object generalListType();
   Object generalSetType();
+
 };
 
 class GenericEntityTypeContextProxy : public ContextProxy {
@@ -1283,6 +1357,7 @@ class GroupQualifierContextProxy : public ContextProxy {
 public:
   GroupQualifierContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object entityRef();
+
 };
 
 class IfStmtContextProxy : public ContextProxy {
@@ -1309,6 +1384,7 @@ public:
   IfStmtStatementsContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object stmt();
   Object stmtAt(size_t i);
+
 };
 
 class IfStmtElseStatementsContextProxy : public ContextProxy {
@@ -1316,12 +1392,14 @@ public:
   IfStmtElseStatementsContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object stmt();
   Object stmtAt(size_t i);
+
 };
 
 class IncrementContextProxy : public ContextProxy {
 public:
   IncrementContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object numericExpression();
+
 };
 
 class IncrementControlContextProxy : public ContextProxy {
@@ -1339,18 +1417,21 @@ class IndexContextProxy : public ContextProxy {
 public:
   IndexContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object numericExpression();
+
 };
 
 class Index1ContextProxy : public ContextProxy {
 public:
   Index1ContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object index();
+
 };
 
 class Index2ContextProxy : public ContextProxy {
 public:
   Index2ContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object index();
+
 };
 
 class IndexQualifierContextProxy : public ContextProxy {
@@ -1358,11 +1439,13 @@ public:
   IndexQualifierContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object index1();
   Object index2();
+
 };
 
 class IntegerTypeContextProxy : public ContextProxy {
 public:
   IntegerTypeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object INTEGER();
 };
 
@@ -1371,6 +1454,7 @@ public:
   InterfaceSpecificationContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object referenceClause();
   Object useClause();
+
 };
 
 class ReferenceClauseContextProxy : public ContextProxy {
@@ -1401,29 +1485,35 @@ public:
   Object intervalOpAt(size_t i);
   Object intervalItem();
   Object intervalHigh();
+
 };
 
 class IntervalLowContextProxy : public ContextProxy {
 public:
   IntervalLowContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object simpleExpression();
+
 };
 
 class IntervalOpContextProxy : public ContextProxy {
 public:
   IntervalOpContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
+
 };
 
 class IntervalItemContextProxy : public ContextProxy {
 public:
   IntervalItemContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object simpleExpression();
+
 };
 
 class IntervalHighContextProxy : public ContextProxy {
 public:
   IntervalHighContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object simpleExpression();
+
 };
 
 class InverseAttrContextProxy : public ContextProxy {
@@ -1459,6 +1549,7 @@ public:
 class LogicalLiteralContextProxy : public ContextProxy {
 public:
   LogicalLiteralContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object FALSE();
   Object TRUE();
   Object UNKNOWN();
@@ -1467,6 +1558,7 @@ public:
 class StringLiteralContextProxy : public ContextProxy {
 public:
   StringLiteralContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SimpleStringLiteral();
   Object EncodedStringLiteral();
 };
@@ -1478,17 +1570,20 @@ public:
   Object variableIdAt(size_t i);
   Object parameterType();
   Object expression();
+
 };
 
 class LogicalTypeContextProxy : public ContextProxy {
 public:
   LogicalTypeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object LOGICAL();
 };
 
 class MultiplicationLikeOpContextProxy : public ContextProxy {
 public:
   MultiplicationLikeOpContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object DIV();
   Object MOD();
   Object AND();
@@ -1514,11 +1609,14 @@ public:
 class NullStmtContextProxy : public ContextProxy {
 public:
   NullStmtContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
+
 };
 
 class NumberTypeContextProxy : public ContextProxy {
 public:
   NumberTypeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object NUMBER();
 };
 
@@ -1543,12 +1641,14 @@ class PopulationContextProxy : public ContextProxy {
 public:
   PopulationContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object entityRef();
+
 };
 
 class PrecisionSpecContextProxy : public ContextProxy {
 public:
   PrecisionSpecContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object numericExpression();
+
 };
 
 class PrimaryContextProxy : public ContextProxy {
@@ -1558,6 +1658,7 @@ public:
   Object qualifiableFactor();
   Object qualifier();
   Object qualifierAt(size_t i);
+
 };
 
 class QualifiableFactorContextProxy : public ContextProxy {
@@ -1568,6 +1669,7 @@ public:
   Object functionCall();
   Object generalRef();
   Object population();
+
 };
 
 class ProcedureCallStmtContextProxy : public ContextProxy {
@@ -1576,6 +1678,7 @@ public:
   Object builtInProcedure();
   Object procedureRef();
   Object actualParameterList();
+
 };
 
 class ProcedureHeadContextProxy : public ContextProxy {
@@ -1623,6 +1726,7 @@ public:
   ReferencedAttributeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object attributeRef();
   Object qualifiedAttribute();
+
 };
 
 class ResourceOrRenameContextProxy : public ContextProxy {
@@ -1636,6 +1740,8 @@ public:
 class RelOpContextProxy : public ContextProxy {
 public:
   RelOpContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
+
 };
 
 class RenameIdContextProxy : public ContextProxy {
@@ -1646,6 +1752,7 @@ public:
   Object functionId();
   Object procedureId();
   Object typeId();
+
 };
 
 class RepeatControlContextProxy : public ContextProxy {
@@ -1654,6 +1761,7 @@ public:
   Object incrementControl();
   Object whileControl();
   Object untilControl();
+
 };
 
 class WhileControlContextProxy : public ContextProxy {
@@ -1688,6 +1796,7 @@ public:
   Object functionRef();
   Object procedureRef();
   Object typeRef();
+
 };
 
 class ReturnStmtContextProxy : public ContextProxy {
@@ -1726,6 +1835,7 @@ public:
   Object constantDecl();
   Object schemaBodyDeclaration();
   Object schemaBodyDeclarationAt(size_t i);
+
 };
 
 class SchemaBodyDeclarationContextProxy : public ContextProxy {
@@ -1733,6 +1843,7 @@ public:
   SchemaBodyDeclarationContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object declaration();
   Object ruleDecl();
+
 };
 
 class SchemaDeclContextProxy : public ContextProxy {
@@ -1749,6 +1860,7 @@ class SchemaVersionIdContextProxy : public ContextProxy {
 public:
   SchemaVersionIdContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object stringLiteral();
+
 };
 
 class SelectExtensionContextProxy : public ContextProxy {
@@ -1765,6 +1877,7 @@ public:
   SelectListContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object namedTypes();
   Object namedTypesAt(size_t i);
+
 };
 
 class TermContextProxy : public ContextProxy {
@@ -1774,6 +1887,7 @@ public:
   Object factorAt(size_t i);
   Object multiplicationLikeOp();
   Object multiplicationLikeOpAt(size_t i);
+
 };
 
 class SimpleFactorExpressionContextProxy : public ContextProxy {
@@ -1781,6 +1895,7 @@ public:
   SimpleFactorExpressionContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object expression();
   Object primary();
+
 };
 
 class SimpleFactorUnaryExpressionContextProxy : public ContextProxy {
@@ -1788,11 +1903,13 @@ public:
   SimpleFactorUnaryExpressionContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object unaryOp();
   Object simpleFactorExpression();
+
 };
 
 class UnaryOpContextProxy : public ContextProxy {
 public:
   UnaryOpContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object NOT();
 };
 
@@ -1806,6 +1923,7 @@ public:
 class SkipStmtContextProxy : public ContextProxy {
 public:
   SkipStmtContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
+
   Object SKIP_();
 };
 
@@ -1815,6 +1933,7 @@ public:
   Object abstractEntityDeclaration();
   Object abstractSupertypeDeclaration();
   Object supertypeRule();
+
 };
 
 class SubtypeDeclarationContextProxy : public ContextProxy {
@@ -1832,6 +1951,7 @@ public:
   Object abstractSupertype();
   Object totalOver();
   Object supertypeExpression();
+
 };
 
 class TotalOverContextProxy : public ContextProxy {
@@ -1873,6 +1993,7 @@ public:
   Object entityRef();
   Object oneOf();
   Object supertypeExpression();
+
 };
 
 class SyntaxContextProxy : public ContextProxy {
@@ -1888,6 +2009,7 @@ public:
   UnderlyingTypeContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object concreteTypes();
   Object constructedTypes();
+
 };
 
 class UniqueRuleContextProxy : public ContextProxy {
@@ -1896,12 +2018,14 @@ public:
   Object referencedAttribute();
   Object referencedAttributeAt(size_t i);
   Object ruleLabelId();
+
 };
 
 class WidthContextProxy : public ContextProxy {
 public:
   WidthContextProxy(tree::ParseTree* ctx) : ContextProxy(ctx) {};
   Object numericExpression();
+
 };
 
 
@@ -6517,7 +6641,7 @@ Object ActualParameterListContextProxy::parameter() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ActualParameterListContextProxy::parameterAt(size_t i) {
@@ -6601,7 +6725,7 @@ Object AggregateInitializerContextProxy::element() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AggregateInitializerContextProxy::elementAt(size_t i) {
@@ -6695,7 +6819,7 @@ Object SimpleExpressionContextProxy::term() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SimpleExpressionContextProxy::termAt(size_t i) {
@@ -6729,7 +6853,7 @@ Object SimpleExpressionContextProxy::addLikeOp() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SimpleExpressionContextProxy::addLikeOpAt(size_t i) {
@@ -7338,7 +7462,7 @@ Object AlgorithmHeadContextProxy::declaration() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AlgorithmHeadContextProxy::declarationAt(size_t i) {
@@ -7512,7 +7636,7 @@ Object ConstantDeclContextProxy::constantBody() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ConstantDeclContextProxy::constantBodyAt(size_t i) {
@@ -7576,7 +7700,7 @@ Object LocalDeclContextProxy::localVariable() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object LocalDeclContextProxy::localVariableAt(size_t i) {
@@ -7680,7 +7804,7 @@ Object AliasStmtContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AliasStmtContextProxy::stmtAt(size_t i) {
@@ -7714,7 +7838,7 @@ Object AliasStmtContextProxy::qualifier() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AliasStmtContextProxy::qualifierAt(size_t i) {
@@ -8233,7 +8357,7 @@ Object AssignmentStmtContextProxy::qualifier() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AssignmentStmtContextProxy::qualifierAt(size_t i) {
@@ -8267,7 +8391,7 @@ Object ExpressionContextProxy::simpleExpression() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ExpressionContextProxy::simpleExpressionAt(size_t i) {
@@ -9091,7 +9215,7 @@ Object CaseActionContextProxy::caseLabel() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object CaseActionContextProxy::caseLabelAt(size_t i) {
@@ -9185,7 +9309,7 @@ Object CaseStmtContextProxy::caseAction() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object CaseStmtContextProxy::caseActionAt(size_t i) {
@@ -9319,7 +9443,7 @@ Object CompoundStmtContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object CompoundStmtContextProxy::stmtAt(size_t i) {
@@ -9988,7 +10112,7 @@ Object FunctionDeclContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FunctionDeclContextProxy::stmtAt(size_t i) {
@@ -10042,7 +10166,7 @@ Object ProcedureDeclContextProxy::procedureHead() {
       return child;
     }
   }
-  
+
   return Nil;
 }
 
@@ -10077,7 +10201,7 @@ Object ProcedureDeclContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ProcedureDeclContextProxy::stmtAt(size_t i) {
@@ -10331,7 +10455,7 @@ Object DeriveClauseContextProxy::derivedAttr() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object DeriveClauseContextProxy::derivedAttrAt(size_t i) {
@@ -10440,7 +10564,7 @@ Object EntityBodyContextProxy::explicitAttr() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object EntityBodyContextProxy::explicitAttrAt(size_t i) {
@@ -10554,7 +10678,7 @@ Object ExplicitAttrContextProxy::attributeDecl() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ExplicitAttrContextProxy::attributeDeclAt(size_t i) {
@@ -10623,7 +10747,7 @@ Object InverseClauseContextProxy::inverseAttr() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object InverseClauseContextProxy::inverseAttrAt(size_t i) {
@@ -10672,7 +10796,7 @@ Object UniqueClauseContextProxy::uniqueRule() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object UniqueClauseContextProxy::uniqueRuleAt(size_t i) {
@@ -10721,7 +10845,7 @@ Object WhereClauseContextProxy::domainRule() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object WhereClauseContextProxy::domainRuleAt(size_t i) {
@@ -10790,7 +10914,7 @@ Object EntityConstructorContextProxy::expression() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object EntityConstructorContextProxy::expressionAt(size_t i) {
@@ -10989,7 +11113,7 @@ Object EnumerationItemsContextProxy::enumerationItem() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object EnumerationItemsContextProxy::enumerationItemAt(size_t i) {
@@ -11148,7 +11272,7 @@ Object FactorContextProxy::simpleFactor() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FactorContextProxy::simpleFactorAt(size_t i) {
@@ -11322,7 +11446,7 @@ Object FormalParameterContextProxy::parameterId() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FormalParameterContextProxy::parameterIdAt(size_t i) {
@@ -11476,7 +11600,7 @@ Object FunctionHeadContextProxy::formalParameter() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FunctionHeadContextProxy::formalParameterAt(size_t i) {
@@ -12240,7 +12364,7 @@ Object IfStmtStatementsContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object IfStmtStatementsContextProxy::stmtAt(size_t i) {
@@ -12274,7 +12398,7 @@ Object IfStmtElseStatementsContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object IfStmtElseStatementsContextProxy::stmtAt(size_t i) {
@@ -12613,7 +12737,7 @@ Object ReferenceClauseContextProxy::resourceOrRename() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ReferenceClauseContextProxy::resourceOrRenameAt(size_t i) {
@@ -12697,7 +12821,7 @@ Object UseClauseContextProxy::namedTypeOrRename() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object UseClauseContextProxy::namedTypeOrRenameAt(size_t i) {
@@ -12781,7 +12905,7 @@ Object IntervalContextProxy::intervalOp() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object IntervalContextProxy::intervalOpAt(size_t i) {
@@ -13255,7 +13379,7 @@ Object LocalVariableContextProxy::variableId() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object LocalVariableContextProxy::variableIdAt(size_t i) {
@@ -13519,7 +13643,7 @@ Object OneOfContextProxy::supertypeExpression() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object OneOfContextProxy::supertypeExpressionAt(size_t i) {
@@ -13568,7 +13692,7 @@ Object SupertypeExpressionContextProxy::supertypeFactor() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeExpressionContextProxy::supertypeFactorAt(size_t i) {
@@ -13595,7 +13719,7 @@ Object SupertypeExpressionContextProxy::ANDOR() {
   Array a;
 
   if (orig == nullptr) {
-    return a;
+    return std::move(a);
   }
 
   auto vec = ((ExpressParser::SupertypeExpressionContext*)orig) -> ANDOR();
@@ -13605,7 +13729,7 @@ Object SupertypeExpressionContextProxy::ANDOR() {
     a.push(detail::To_Ruby<TerminalNodeProxy>().convert(proxy));
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeExpressionContextProxy::ANDORAt(size_t i) {
@@ -13714,7 +13838,7 @@ Object PrimaryContextProxy::qualifier() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object PrimaryContextProxy::qualifierAt(size_t i) {
@@ -13928,7 +14052,7 @@ Object ProcedureHeadContextProxy::procedureHeadParameter() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ProcedureHeadContextProxy::procedureHeadParameterAt(size_t i) {
@@ -14522,7 +14646,7 @@ Object RepeatStmtContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object RepeatStmtContextProxy::stmtAt(size_t i) {
@@ -14781,7 +14905,7 @@ Object RuleDeclContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object RuleDeclContextProxy::stmtAt(size_t i) {
@@ -14850,7 +14974,7 @@ Object RuleHeadContextProxy::entityRef() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object RuleHeadContextProxy::entityRefAt(size_t i) {
@@ -14914,7 +15038,7 @@ Object SchemaBodyContextProxy::interfaceSpecification() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SchemaBodyContextProxy::interfaceSpecificationAt(size_t i) {
@@ -14968,7 +15092,7 @@ Object SchemaBodyContextProxy::schemaBodyDeclaration() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SchemaBodyContextProxy::schemaBodyDeclarationAt(size_t i) {
@@ -15222,7 +15346,7 @@ Object SelectListContextProxy::namedTypes() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SelectListContextProxy::namedTypesAt(size_t i) {
@@ -15256,7 +15380,7 @@ Object TermContextProxy::factor() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object TermContextProxy::factorAt(size_t i) {
@@ -15290,7 +15414,7 @@ Object TermContextProxy::multiplicationLikeOp() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object TermContextProxy::multiplicationLikeOpAt(size_t i) {
@@ -15529,7 +15653,7 @@ Object SubtypeDeclarationContextProxy::entityRef() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SubtypeDeclarationContextProxy::entityRefAt(size_t i) {
@@ -15653,7 +15777,7 @@ Object TotalOverContextProxy::entityRef() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object TotalOverContextProxy::entityRefAt(size_t i) {
@@ -15807,7 +15931,7 @@ Object SupertypeFactorContextProxy::supertypeTerm() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeFactorContextProxy::supertypeTermAt(size_t i) {
@@ -15834,7 +15958,7 @@ Object SupertypeFactorContextProxy::AND() {
   Array a;
 
   if (orig == nullptr) {
-    return a;
+    return std::move(a);
   }
 
   auto vec = ((ExpressParser::SupertypeFactorContext*)orig) -> AND();
@@ -15844,7 +15968,7 @@ Object SupertypeFactorContextProxy::AND() {
     a.push(detail::To_Ruby<TerminalNodeProxy>().convert(proxy));
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeFactorContextProxy::ANDAt(size_t i) {
@@ -15933,7 +16057,7 @@ Object SyntaxContextProxy::schemaDecl() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SyntaxContextProxy::schemaDeclAt(size_t i) {
@@ -16022,7 +16146,7 @@ Object UniqueRuleContextProxy::referencedAttribute() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object UniqueRuleContextProxy::referencedAttributeAt(size_t i) {
@@ -16092,12 +16216,20 @@ public:
 
   Object ruby_visit(ContextProxy* proxy) {
     auto result = visit(proxy -> getOriginal());
-    return result.as<Object>();
+    try {
+      return std::any_cast<Object>(result);
+    } catch(std::bad_cast) {
+      return Qnil;
+    }
   }
 
   Object ruby_visitChildren(ContextProxy* proxy) {
     auto result = visitChildren(proxy -> getOriginal());
-    return result.as<Object>();
+    try {
+      return std::any_cast<Object>(result);
+    } catch(std::bad_cast) {
+      return Qnil;
+    }
   }
 
   virtual antlrcpp::Any visitAttributeRef(ExpressParser::AttributeRefContext *ctx) override {
@@ -17135,7 +17267,6 @@ public:
 
     return a;
   }
-
   Object visit(VisitorProxy* visitor) {
     auto result = visitor -> visit(this -> parser -> syntax());
 
@@ -17143,7 +17274,7 @@ public:
     this -> lexer -> reset();
     this -> parser -> reset();
 
-    return result;
+    return std::any_cast<Object>(result);
   }
 
   ~ParserProxy() {
@@ -17161,6 +17292,7 @@ private:
     parser -> lexer = new ExpressLexer(parser -> input);
     parser -> tokens = new CommonTokenStream(parser -> lexer);
     parser -> parser = new ExpressParser(parser -> tokens);
+
     return parser;
   }
 
@@ -17992,7 +18124,7 @@ Object ContextProxy::wrapParseTree(tree::ParseTree* node) {
 
 extern "C"
 void Init_express_parser() {
-  rb_mExpressParser = define_module("ExpressParser");
+  Module rb_mExpressParser = define_module("ExpressParser");
 
   rb_cToken = define_class_under<Token>(rb_mExpressParser, "Token")
     .define_method("text", &Token::getText)
@@ -18221,7 +18353,7 @@ void Init_express_parser() {
     .define_singleton_function("parse", &ParserProxy::parse)
     .define_singleton_function("parse_file", &ParserProxy::parseFile)
     .define_method("syntax", &ParserProxy::syntax, Return().keepAlive())
-    .define_method("tokens", &ParserProxy::getTokens, Return().takeOwnership())
+    .define_method("tokens", &ParserProxy::getTokens)
     .define_method("visit", &ParserProxy::visit, Return().keepAlive());
 
   rb_cAttributeRefContext = define_class_under<AttributeRefContextProxy, ContextProxy>(rb_mExpressParser, "AttributeRefContext")