expressir 1.2.3 → 1.2.6

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;
@@ -231,6 +228,8 @@ Class rb_cParser;
 Class rb_cParseTree;
 Class rb_cTerminalNode;
 Class rb_cContextProxy;
+Class rb_cParserExt;
+Class rb_cTokenExt;
 
 namespace Rice::detail {
   template <>
@@ -261,6 +260,28 @@ namespace Rice::detail {
   };
 }
 
+class TokenProxy : public Object {
+  public:
+    TokenProxy(Token* orig) {
+      this -> orig = orig;
+    }
+
+    std::string getText() {
+      return orig->getText();
+    }
+
+    size_t getChannel() {
+      return orig->getChannel();
+    }
+
+    size_t getTokenIndex() {
+      return orig->getTokenIndex();
+    }
+
+  private:
+    Token * orig = nullptr;
+};
+
 class ContextProxy {
 public:
   ContextProxy(tree::ParseTree* orig) {
@@ -288,39 +309,25 @@ public:
   }
 
   Array getChildren() {
-    if (children == nullptr) {
-      children = new Array();
-
-      if (orig != nullptr) {
-        for (auto it = orig -> children.begin(); it != orig -> children.end(); it ++) {
-          Object parseTree = ContextProxy::wrapParseTree(*it);
+    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);
-          }
+        if (parseTree != Nil) {
+          children.push(parseTree);
         }
       }
     }
-
-    return *children;
+    return children;
   }
 
   Object getParent() {
-    if (parent == Nil) {
-      if (orig != nullptr) {
-        parent = ContextProxy::wrapParseTree(orig -> parent);
-      }
-    }
-
-    return parent;
+    return orig == nullptr ? Nil : ContextProxy::wrapParseTree(orig -> parent);
   }
 
   size_t childCount() {
-    if (orig == nullptr) {
-      return 0;
-    }
-
-    return getChildren().size();
+    return orig == nullptr ? 0 : orig -> children.size();
   }
 
   bool doubleEquals(Object other) {
@@ -337,8 +344,6 @@ private:
 
 protected:
   tree::ParseTree* orig = nullptr;
-  Array* children = nullptr;
-  Object parent = Nil;
 };
 
 class TerminalNodeProxy : public ContextProxy {
@@ -6660,7 +6665,7 @@ Object ActualParameterListContextProxy::parameter() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ActualParameterListContextProxy::parameterAt(size_t i) {
@@ -6744,7 +6749,7 @@ Object AggregateInitializerContextProxy::element() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AggregateInitializerContextProxy::elementAt(size_t i) {
@@ -6838,7 +6843,7 @@ Object SimpleExpressionContextProxy::term() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SimpleExpressionContextProxy::termAt(size_t i) {
@@ -6872,7 +6877,7 @@ Object SimpleExpressionContextProxy::addLikeOp() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SimpleExpressionContextProxy::addLikeOpAt(size_t i) {
@@ -7481,7 +7486,7 @@ Object AlgorithmHeadContextProxy::declaration() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AlgorithmHeadContextProxy::declarationAt(size_t i) {
@@ -7655,7 +7660,7 @@ Object ConstantDeclContextProxy::constantBody() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ConstantDeclContextProxy::constantBodyAt(size_t i) {
@@ -7719,7 +7724,7 @@ Object LocalDeclContextProxy::localVariable() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object LocalDeclContextProxy::localVariableAt(size_t i) {
@@ -7823,7 +7828,7 @@ Object AliasStmtContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AliasStmtContextProxy::stmtAt(size_t i) {
@@ -7857,7 +7862,7 @@ Object AliasStmtContextProxy::qualifier() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AliasStmtContextProxy::qualifierAt(size_t i) {
@@ -8376,7 +8381,7 @@ Object AssignmentStmtContextProxy::qualifier() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object AssignmentStmtContextProxy::qualifierAt(size_t i) {
@@ -8410,7 +8415,7 @@ Object ExpressionContextProxy::simpleExpression() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ExpressionContextProxy::simpleExpressionAt(size_t i) {
@@ -9234,7 +9239,7 @@ Object CaseActionContextProxy::caseLabel() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object CaseActionContextProxy::caseLabelAt(size_t i) {
@@ -9328,7 +9333,7 @@ Object CaseStmtContextProxy::caseAction() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object CaseStmtContextProxy::caseActionAt(size_t i) {
@@ -9462,7 +9467,7 @@ Object CompoundStmtContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object CompoundStmtContextProxy::stmtAt(size_t i) {
@@ -10131,7 +10136,7 @@ Object FunctionDeclContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FunctionDeclContextProxy::stmtAt(size_t i) {
@@ -10220,7 +10225,7 @@ Object ProcedureDeclContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ProcedureDeclContextProxy::stmtAt(size_t i) {
@@ -10474,7 +10479,7 @@ Object DeriveClauseContextProxy::derivedAttr() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object DeriveClauseContextProxy::derivedAttrAt(size_t i) {
@@ -10583,7 +10588,7 @@ Object EntityBodyContextProxy::explicitAttr() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object EntityBodyContextProxy::explicitAttrAt(size_t i) {
@@ -10697,7 +10702,7 @@ Object ExplicitAttrContextProxy::attributeDecl() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ExplicitAttrContextProxy::attributeDeclAt(size_t i) {
@@ -10766,7 +10771,7 @@ Object InverseClauseContextProxy::inverseAttr() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object InverseClauseContextProxy::inverseAttrAt(size_t i) {
@@ -10815,7 +10820,7 @@ Object UniqueClauseContextProxy::uniqueRule() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object UniqueClauseContextProxy::uniqueRuleAt(size_t i) {
@@ -10864,7 +10869,7 @@ Object WhereClauseContextProxy::domainRule() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object WhereClauseContextProxy::domainRuleAt(size_t i) {
@@ -10933,7 +10938,7 @@ Object EntityConstructorContextProxy::expression() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object EntityConstructorContextProxy::expressionAt(size_t i) {
@@ -11132,7 +11137,7 @@ Object EnumerationItemsContextProxy::enumerationItem() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object EnumerationItemsContextProxy::enumerationItemAt(size_t i) {
@@ -11291,7 +11296,7 @@ Object FactorContextProxy::simpleFactor() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FactorContextProxy::simpleFactorAt(size_t i) {
@@ -11465,7 +11470,7 @@ Object FormalParameterContextProxy::parameterId() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FormalParameterContextProxy::parameterIdAt(size_t i) {
@@ -11619,7 +11624,7 @@ Object FunctionHeadContextProxy::formalParameter() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object FunctionHeadContextProxy::formalParameterAt(size_t i) {
@@ -12383,7 +12388,7 @@ Object IfStmtStatementsContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object IfStmtStatementsContextProxy::stmtAt(size_t i) {
@@ -12417,7 +12422,7 @@ Object IfStmtElseStatementsContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object IfStmtElseStatementsContextProxy::stmtAt(size_t i) {
@@ -12756,7 +12761,7 @@ Object ReferenceClauseContextProxy::resourceOrRename() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ReferenceClauseContextProxy::resourceOrRenameAt(size_t i) {
@@ -12840,7 +12845,7 @@ Object UseClauseContextProxy::namedTypeOrRename() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object UseClauseContextProxy::namedTypeOrRenameAt(size_t i) {
@@ -12924,7 +12929,7 @@ Object IntervalContextProxy::intervalOp() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object IntervalContextProxy::intervalOpAt(size_t i) {
@@ -13398,7 +13403,7 @@ Object LocalVariableContextProxy::variableId() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object LocalVariableContextProxy::variableIdAt(size_t i) {
@@ -13662,7 +13667,7 @@ Object OneOfContextProxy::supertypeExpression() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object OneOfContextProxy::supertypeExpressionAt(size_t i) {
@@ -13711,7 +13716,7 @@ Object SupertypeExpressionContextProxy::supertypeFactor() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeExpressionContextProxy::supertypeFactorAt(size_t i) {
@@ -13738,7 +13743,7 @@ Object SupertypeExpressionContextProxy::ANDOR() {
   Array a;
 
   if (orig == nullptr) {
-    return a;
+    return std::move(a);
   }
 
   auto vec = ((ExpressParser::SupertypeExpressionContext*)orig) -> ANDOR();
@@ -13748,7 +13753,7 @@ Object SupertypeExpressionContextProxy::ANDOR() {
     a.push(detail::To_Ruby<TerminalNodeProxy>().convert(proxy));
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeExpressionContextProxy::ANDORAt(size_t i) {
@@ -13857,7 +13862,7 @@ Object PrimaryContextProxy::qualifier() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object PrimaryContextProxy::qualifierAt(size_t i) {
@@ -14071,7 +14076,7 @@ Object ProcedureHeadContextProxy::procedureHeadParameter() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object ProcedureHeadContextProxy::procedureHeadParameterAt(size_t i) {
@@ -14665,7 +14670,7 @@ Object RepeatStmtContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object RepeatStmtContextProxy::stmtAt(size_t i) {
@@ -14924,7 +14929,7 @@ Object RuleDeclContextProxy::stmt() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object RuleDeclContextProxy::stmtAt(size_t i) {
@@ -14993,7 +14998,7 @@ Object RuleHeadContextProxy::entityRef() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object RuleHeadContextProxy::entityRefAt(size_t i) {
@@ -15057,7 +15062,7 @@ Object SchemaBodyContextProxy::interfaceSpecification() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SchemaBodyContextProxy::interfaceSpecificationAt(size_t i) {
@@ -15111,7 +15116,7 @@ Object SchemaBodyContextProxy::schemaBodyDeclaration() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SchemaBodyContextProxy::schemaBodyDeclarationAt(size_t i) {
@@ -15365,7 +15370,7 @@ Object SelectListContextProxy::namedTypes() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SelectListContextProxy::namedTypesAt(size_t i) {
@@ -15399,7 +15404,7 @@ Object TermContextProxy::factor() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object TermContextProxy::factorAt(size_t i) {
@@ -15433,7 +15438,7 @@ Object TermContextProxy::multiplicationLikeOp() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object TermContextProxy::multiplicationLikeOpAt(size_t i) {
@@ -15672,7 +15677,7 @@ Object SubtypeDeclarationContextProxy::entityRef() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SubtypeDeclarationContextProxy::entityRefAt(size_t i) {
@@ -15796,7 +15801,7 @@ Object TotalOverContextProxy::entityRef() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object TotalOverContextProxy::entityRefAt(size_t i) {
@@ -15950,7 +15955,7 @@ Object SupertypeFactorContextProxy::supertypeTerm() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeFactorContextProxy::supertypeTermAt(size_t i) {
@@ -15977,7 +15982,7 @@ Object SupertypeFactorContextProxy::AND() {
   Array a;
 
   if (orig == nullptr) {
-    return a;
+    return std::move(a);
   }
 
   auto vec = ((ExpressParser::SupertypeFactorContext*)orig) -> AND();
@@ -15987,7 +15992,7 @@ Object SupertypeFactorContextProxy::AND() {
     a.push(detail::To_Ruby<TerminalNodeProxy>().convert(proxy));
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SupertypeFactorContextProxy::ANDAt(size_t i) {
@@ -16076,7 +16081,7 @@ Object SyntaxContextProxy::schemaDecl() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object SyntaxContextProxy::schemaDeclAt(size_t i) {
@@ -16165,7 +16170,7 @@ Object UniqueRuleContextProxy::referencedAttribute() {
     }
   }
 
-  return a;
+  return std::move(a);
 }
 
 Object UniqueRuleContextProxy::referencedAttributeAt(size_t i) {
@@ -16235,12 +16240,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 {
@@ -17267,18 +17280,6 @@ public:
     return detail::To_Ruby<SyntaxContextProxy>().convert(proxy);
   }
 
-  Array getTokens() {
-    Array a;
-
-    std::vector<Token*> tokens = this -> tokens -> getTokens();
-
-    for (auto &token : tokens) {
-      a.push(token);
-    }
-
-    return a;
-  }
-
   Object visit(VisitorProxy* visitor) {
     auto result = visitor -> visit(this -> parser -> syntax());
 
@@ -17286,7 +17287,7 @@ public:
     this -> lexer -> reset();
     this -> parser -> reset();
 
-    return result;
+    return std::any_cast<Object>(result);
   }
 
   ~ParserProxy() {
@@ -18133,10 +18134,63 @@ Object ContextProxy::wrapParseTree(tree::ParseTree* node) {
   }
 }
 
+class ParserProxyExt : public Object {
+  public:
+    ParserProxyExt(Object self, string file) {
+      ifstream stream;
+      stream.open(file);
+      input = new ANTLRInputStream(stream);
+      lexer = new ExpressLexer(input);
+      tokens = new CommonTokenStream(lexer);
+      parser = new ExpressParser(tokens);
+      stream.close();
+    };
+
+    ~ParserProxyExt() {
+      delete parser;
+      delete tokens;
+      delete lexer;
+      delete input;
+    }
+
+    Object syntax() {
+      auto ctx = parser -> syntax();
+
+      SyntaxContextProxy proxy((ExpressParser::SyntaxContext*) ctx);
+      return detail::To_Ruby<SyntaxContextProxy>().convert(proxy);
+    }
+
+    Array getTokens() {
+      Array a;
+      for (auto token : tokens -> getTokens()) {
+        a.push(new TokenProxy(token));
+      }
+      return a;
+    }
+
+    Object visit(VisitorProxy* visitor) {
+      auto result = visitor -> visit(parser -> syntax());
+
+      lexer -> reset();
+      parser -> reset();
+
+      try {
+        return std::any_cast<Object>(result);
+      } catch(std::bad_cast) {
+       return Qnil;
+      }
+    }
+
+  private:
+    ANTLRInputStream* input;
+    ExpressLexer* lexer;
+    CommonTokenStream* tokens;
+    ExpressParser* parser;
+};
 
 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)
@@ -18364,9 +18418,19 @@ void Init_express_parser() {
   rb_cParser = define_class_under<ParserProxy>(rb_mExpressParser, "Parser")
     .define_singleton_function("parse", &ParserProxy::parse)
     .define_singleton_function("parse_file", &ParserProxy::parseFile)
-    .define_method("syntax", &ParserProxy::syntax)
-    .define_method("tokens", &ParserProxy::getTokens)
-    .define_method("visit", &ParserProxy::visit);
+    .define_method("syntax", &ParserProxy::syntax, Return().keepAlive())
+    .define_method("visit", &ParserProxy::visit, Return().keepAlive());
+
+  rb_cTokenExt = define_class_under<TokenProxy>(rb_mExpressParser, "TokenExt")
+    .define_method("text", &TokenProxy::getText)
+    .define_method("channel", &TokenProxy::getChannel)
+    .define_method("token_index", &TokenProxy::getTokenIndex);
+
+  rb_cParserExt = define_class_under<ParserProxyExt>(rb_mExpressParser, "ParserExt")
+    .define_constructor(Constructor<ParserProxyExt, Object, string>())
+    .define_method("syntax", &ParserProxyExt::syntax, Return().keepAlive())
+    .define_method("tokens", &ParserProxyExt::getTokens)
+    .define_method("visit", &ParserProxyExt::visit, Return().keepAlive());
 
   rb_cAttributeRefContext = define_class_under<AttributeRefContextProxy, ContextProxy>(rb_mExpressParser, "AttributeRefContext")
     .define_method("attribute_id", &AttributeRefContextProxy::attributeId);