Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly parse qualified identifiers #3111

Merged
merged 28 commits into from
Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fceb5be
Towards proper parsing of qualified ids
ajreynol Mar 28, 2019
8c38c6e
Fix
ajreynol Mar 28, 2019
16bf07b
Merge branch 'master' of https://github.com/CVC4/CVC4 into smt2QualId
ajreynol Jul 1, 2019
3dc2b8c
Merge branch 'master' of https://github.com/CVC4/CVC4 into smt2QualId
ajreynol Jul 1, 2019
06042e7
Merge branch 'master' of https://github.com/CVC4/CVC4 into smt2QualId
ajreynol Jul 2, 2019
e00ff76
Merge branch 'master' of https://github.com/CVC4/CVC4 into smt2QualId
ajreynol Jul 19, 2019
ae570b6
Add failing benchmark
ajreynol Jul 19, 2019
fe22b39
Properly incorporate qualified identifiers applied to non-nullary con…
ajreynol Jul 19, 2019
562f82e
No casts on atomic terms, partially incorporate indexed functions in …
ajreynol Jul 19, 2019
66b8fe2
Special case for testers
ajreynol Jul 19, 2019
f2fc8b2
Very ugly incorporation of array constants
ajreynol Jul 19, 2019
cc4c143
Disallow nested qual id, refactor
ajreynol Jul 19, 2019
7ea279d
Kind from identifier
ajreynol Jul 19, 2019
3e7c075
More refactoring
ajreynol Jul 22, 2019
848d62e
More refactor
ajreynol Jul 22, 2019
b4a9942
Documentation
ajreynol Jul 22, 2019
9da05ef
More refactor, improve doc
ajreynol Jul 22, 2019
301678f
Format
ajreynol Jul 22, 2019
cc243f7
Minor
ajreynol Jul 22, 2019
b90c264
Minor, assert to check
ajreynol Jul 22, 2019
3d1943d
Rearrange
ajreynol Jul 22, 2019
6c2023e
Update src/parser/smt2/Smt2.g
ajreynol Jul 24, 2019
787210f
Merge branch 'master' into smt2QualId
ajreynol Jul 24, 2019
884b22a
Fix
ajreynol Jul 24, 2019
a441c50
Update src/parser/smt2/Smt2.g
ajreynol Aug 6, 2019
b89d790
Update src/parser/smt2/Smt2.g
ajreynol Aug 6, 2019
8fadad8
Merge branch 'master' into smt2QualId
ajreynol Aug 6, 2019
748b981
Merge branch 'master' into smt2QualId
ajreynol Aug 6, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/parser/parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Expr Parser::getExpressionForName(const std::string& name) {
}

Expr Parser::getExpressionForNameAndType(const std::string& name, Type t) {
assert( isDeclared(name) );
assert(isDeclared(name));
// first check if the variable is declared and not overloaded
Expr expr = getVariable(name);
if(expr.isNull()) {
Expand Down