From f3590092818d9eab9d961ea602093029ff472a85 Mon Sep 17 00:00:00 2001 From: ajreynol Date: Mon, 10 Jul 2017 14:06:52 -0500 Subject: Merge datatype shared selectors/sygus comp 2017 branch. Modify the datatypes decision procedure to share selectors of the same type across multiple constructors. Major rewrite of the SyGuS solver. Adds several new strategies for I/O example problems (PBE) and invariant synthesis. Major simplifications to sygus parsing and synthesis conjecture representation. Do not support check-synth in portfolio. Add sygus regressions. --- src/parser/cvc/Cvc.g | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/parser/cvc') diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index 622fa9c00..c865332e2 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -1616,7 +1616,7 @@ tupleStore[CVC4::Expr& f] const Datatype & dt = ((DatatypeType)t).getDatatype(); args.push_back( dt[0][k].getSelector() ); args.push_back( f ); - f2 = MK_EXPR(CVC4::kind::APPLY_SELECTOR_TOTAL,args); + f2 = MK_EXPR(CVC4::kind::APPLY_SELECTOR,args); } ( ( arrayStore[f2] | DOT ( tupleStore[f2] @@ -1651,7 +1651,7 @@ recordStore[CVC4::Expr& f] const Datatype & dt = ((DatatypeType)t).getDatatype(); args.push_back( dt[0][id].getSelector() ); args.push_back( f ); - f2 = MK_EXPR(CVC4::kind::APPLY_SELECTOR_TOTAL,args); + f2 = MK_EXPR(CVC4::kind::APPLY_SELECTOR,args); } ( ( arrayStore[f2] | DOT ( tupleStore[f2] @@ -1802,7 +1802,7 @@ postfixTerm[CVC4::Expr& f] std::vector sargs; sargs.push_back( dt[0][id].getSelector() ); sargs.push_back( f ); - f = MK_EXPR(CVC4::kind::APPLY_SELECTOR_TOTAL,sargs); + f = MK_EXPR(CVC4::kind::APPLY_SELECTOR,sargs); } | k=numeral { Type t = f.getType(); @@ -1819,7 +1819,7 @@ postfixTerm[CVC4::Expr& f] std::vector sargs; sargs.push_back( dt[0][k].getSelector() ); sargs.push_back( f ); - f = MK_EXPR(CVC4::kind::APPLY_SELECTOR_TOTAL,sargs); + f = MK_EXPR(CVC4::kind::APPLY_SELECTOR,sargs); } ) )* -- cgit v1.2.3