diff options
author | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-05-01 20:44:09 +0000 |
---|---|---|
committer | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-05-01 20:44:09 +0000 |
commit | d0affb22ebcd4cc7cc7dd6ec7a51233d8632d630 (patch) | |
tree | 42246c776b7e060e7ec5d13de28f23883352337b /src/parser/smt2 | |
parent | 40a3135f24b66574518c1b206d012b10332782c7 (diff) |
Fixing private/public header warnings in parser library
Diffstat (limited to 'src/parser/smt2')
-rw-r--r-- | src/parser/smt2/Smt2.g | 14 | ||||
-rw-r--r-- | src/parser/smt2/smt2_input.cpp | 3 | ||||
-rw-r--r-- | src/parser/smt2/smt2_input.h | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g index 422e4b19e..9b5b83a76 100644 --- a/src/parser/smt2/Smt2.g +++ b/src/parser/smt2/Smt2.g @@ -61,7 +61,7 @@ namespace CVC4 { #include "expr/expr.h" #include "expr/kind.h" #include "expr/type.h" -#include "parser/input.h" +#include "parser/antlr_input.h" #include "parser/parser.h" #include "util/integer.h" #include "util/output.h" @@ -142,7 +142,7 @@ command returns [CVC4::Command* cmd] | /* sort declaration */ DECLARE_SORT_TOK identifier[name,CHECK_UNDECLARED,SYM_SORT] n=NUMERAL_TOK { Debug("parser") << "declare sort: '" << name << "' arity=" << n << std::endl; - if( Input::tokenToInteger(n) > 0 ) { + if( AntlrInput::tokenToInteger(n) > 0 ) { Unimplemented("Parameterized user sorts."); } PARSER_STATE->mkSort(name); @@ -172,7 +172,7 @@ command returns [CVC4::Command* cmd] */ term[CVC4::Expr& expr] @init { - Debug("parser") << "term: " << Input::tokenText(LT(1)) << std::endl; + Debug("parser") << "term: " << AntlrInput::tokenText(LT(1)) << std::endl; Kind kind; std::string name; std::vector<Expr> args; @@ -226,10 +226,10 @@ term[CVC4::Expr& expr] | TRUE_TOK { expr = MK_CONST(true); } | FALSE_TOK { expr = MK_CONST(false); } | NUMERAL_TOK - { expr = MK_CONST( Input::tokenToInteger($NUMERAL_TOK) ); } + { expr = MK_CONST( AntlrInput::tokenToInteger($NUMERAL_TOK) ); } | RATIONAL_TOK { // FIXME: This doesn't work because an SMT rational is not a valid GMP rational string - expr = MK_CONST( Input::tokenToRational($RATIONAL_TOK) ); } + expr = MK_CONST( AntlrInput::tokenToRational($RATIONAL_TOK) ); } // NOTE: Theory constants go here ; @@ -250,7 +250,7 @@ termList[std::vector<CVC4::Expr>& formulas, CVC4::Expr& expr] */ builtinOp[CVC4::Kind& kind] @init { - Debug("parser") << "builtin: " << Input::tokenText(LT(1)) << std::endl; + Debug("parser") << "builtin: " << AntlrInput::tokenText(LT(1)) << std::endl; } : NOT_TOK { $kind = CVC4::kind::NOT; } | IMPLIES_TOK { $kind = CVC4::kind::IMPLIES; } @@ -341,7 +341,7 @@ identifier[std::string& id, CVC4::parser::DeclarationCheck check, CVC4::parser::SymbolType type] : IDENTIFIER - { id = Input::tokenText($IDENTIFIER); + { id = AntlrInput::tokenText($IDENTIFIER); Debug("parser") << "identifier: " << id << " check? " << toString(check) << " type? " << toString(type) << std::endl; diff --git a/src/parser/smt2/smt2_input.cpp b/src/parser/smt2/smt2_input.cpp index 5db4a9bd7..f962578e9 100644 --- a/src/parser/smt2/smt2_input.cpp +++ b/src/parser/smt2/smt2_input.cpp @@ -17,6 +17,7 @@ #include "smt2_input.h" #include "expr/expr_manager.h" +#include "parser/input.h" #include "parser/parser.h" #include "parser/parser_exception.h" #include "parser/smt2/generated/Smt2Lexer.h" @@ -27,7 +28,7 @@ namespace parser { /* Use lookahead=2 */ Smt2Input::Smt2Input(AntlrInputStream *inputStream) : - Input(inputStream, 2) { + AntlrInput(inputStream, 2) { pANTLR3_INPUT_STREAM input = inputStream->getAntlr3InputStream(); AlwaysAssert( input != NULL ); diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h index 48fcb7956..2937d4ed8 100644 --- a/src/parser/smt2/smt2_input.h +++ b/src/parser/smt2/smt2_input.h @@ -13,12 +13,12 @@ ** [[ Add file-specific comments here ]] **/ -#include "cvc4parser_public.h" +#include "cvc4parser_private.h" #ifndef __CVC4__PARSER__SMT2_INPUT_H #define __CVC4__PARSER__SMT2_INPUT_H -#include "parser/input.h" +#include "parser/antlr_input.h" #include "parser/smt2/generated/Smt2Lexer.h" #include "parser/smt2/generated/Smt2Parser.h" @@ -32,7 +32,7 @@ class ExprManager; namespace parser { -class Smt2Input : public Input { +class Smt2Input : public AntlrInput { /** The ANTLR3 SMT2 lexer for the input. */ pSmt2Lexer d_pSmt2Lexer; |