PySMT 0.9.7.dev397__tar.gz → 0.9.7.dev408__tar.gz

{pysmt-0.9.7.dev397/PySMT.egg-info → pysmt-0.9.7.dev408}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySMT
-Version: 0.9.7.dev397
+Version: 0.9.7.dev408
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{pysmt-0.9.7.dev397 → pysmt-0.9.7.dev408/PySMT.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PySMT
-Version: 0.9.7.dev397
+Version: 0.9.7.dev408
 Summary: A solver-agnostic library for SMT Formulae manipulation and solving
 Home-page: http://www.pysmt.org
 Author: PySMT Team

{pysmt-0.9.7.dev397 → pysmt-0.9.7.dev408}/pysmt/__init__.py

@@ -19,7 +19,7 @@
 from typing import Tuple, Union
 
 
-VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 397)
+VERSION: Union[Tuple[int, int, int], Tuple[int, int, int, str, int]] = (0, 9, 7, "dev", 408)
 
 # Try to provide human-readable version of latest commit for dev versions
 # E.g. v0.5.1-4-g49a49f2-wip

{pysmt-0.9.7.dev397 → pysmt-0.9.7.dev408}/pysmt/smtlib/parser/parser.py

@@ -1312,15 +1312,39 @@ class SmtLibParser(object):
 
     def _cmd_minmax_maxmin_obj(self, current: str, tokens: Tokenizer) -> SmtLibCommand:
         """(minmax | maxmin <term>+ )"""
-        """TODO: [:id <string>] [:signed]"""
-        params = []
+        params: List[Tuple[str, Union[str, bool]]] = []
+        terms = []
+        signed = False
+        options = False
+
         while True:
-            try:
-                c = self.get_expression(tokens)
-                params.append(c)
-            except PysmtSyntaxError:
+            token = tokens.consume()
+            if token == ")":
                 break
-        return SmtLibCommand(current, [params,None])
+            if token.startswith(":"):
+                options = True
+                if token == ":id":
+                    identifier = self.parse_atom(tokens, "maxmin/minmax")
+                    params.append((token, identifier))
+                elif token == ":signed":
+                    signed = True
+                    params.append((token, signed))
+                else:
+                    raise PysmtSyntaxError(
+                        "Incorrect option in the '%s' command" % token,
+                        tokens.pos_info)
+            else:
+                if options:
+                    raise PysmtSyntaxError(
+                        "Unexpected token '%s' after options in the '%s' command" % (token, current),
+                        tokens.pos_info)
+                tokens.add_extra_token(token)
+                terms.append(self.get_expression(tokens))
+
+        if not any(option[0] == ":signed" for option in params):
+            params.append((":signed", False))
+
+        return SmtLibCommand(current, [terms, params])
 
     def _cmd_objective(self, current: str, tokens: Tokenizer) -> SmtLibCommand:
         """(maximize | minimize <term>"""

{pysmt-0.9.7.dev397 → pysmt-0.9.7.dev408}/pysmt/smtlib/script.py

@@ -122,9 +122,15 @@ class SmtLibCommand(namedtuple('SmtLibCommand', ['name', 'args'])):
 
         elif self.name in [smtcmd.MINMAX, smtcmd.MAXMIN]:
             outstream.write("(%s" % self.name)
-            for a in self.args:
+            for a in self.args[0]:
                 outstream.write(" ")
                 printer.printer(a)
+            for option_name, value in self.args[1] or []:
+                if option_name == ":signed":
+                    if value:
+                        outstream.write(" %s" % option_name)
+                else:
+                    outstream.write(" %s %s" % (option_name, value))
             outstream.write(")")
 
         elif self.name == smtcmd.CHECK_ALLSAT:

{pysmt-0.9.7.dev397 → pysmt-0.9.7.dev408}/pysmt/test/smtlib/test_parser_omt.py

@@ -63,6 +63,139 @@ class TestSmtLibParserOMT(TestCase):
             self.assertEqual(cmd.name, command)
             self.assertEqual(len(cmd.args), len_args)
 
+    def test_parse_minmax_maxmin_with_options(self):
+        parser = SmtLibParser()
+
+        script = parser.get_script(StringIO(
+            "(declare-fun x () Real)\n"
+            "(declare-fun y () Real)\n"
+            "(minmax x y :id g1 :signed)\n"
+        ))
+        cmd = script.commands[-1]
+        self.assertEqual(cmd.name, "minmax")
+        self.assertEqual(cmd.args[1], [(':id', 'g1'), (':signed', True)])
+
+        buf = StringIO()
+        script.serialize(buf)
+        self.assertIn("(minmax x y :id g1 :signed)", buf.getvalue())
+
+        script = parser.get_script(StringIO(
+            "(declare-fun x () Real)\n"
+            "(declare-fun y () Real)\n"
+            "(maxmin x y :id g2)\n"
+        ))
+        cmd = script.commands[-1]
+        self.assertEqual(cmd.name, "maxmin")
+        self.assertEqual(cmd.args[1], [(':id', 'g2'), (':signed', False)])
+
+    def test_parse_minmax_maxmin_signed_only(self):
+        parser = SmtLibParser()
+
+        script = parser.get_script(StringIO(
+            "(declare-fun x () Real)\n"
+            "(declare-fun y () Real)\n"
+            "(maxmin x y :signed)\n"
+        ))
+        cmd = script.commands[-1]
+        self.assertEqual(cmd.name, "maxmin")
+        self.assertEqual(cmd.args[1], [(':signed', True)])
+
+        buf = StringIO()
+        script.serialize(buf)
+        self.assertIn("(maxmin x y :signed)", buf.getvalue())
+
+    def test_parse_minmax_maxmin_invalid_option(self):
+        parser = SmtLibParser()
+        with self.assertRaises(PysmtSyntaxError):
+            parser.get_script(StringIO(
+                "(declare-fun x () Real)\n"
+                "(declare-fun y () Real)\n"
+                "(minmax x y :foo 1)\n"
+            ))
+
+    def test_parse_minmax_multiple_terms_with_options(self):
+        parser = SmtLibParser()
+
+        script = parser.get_script(StringIO(
+            "(declare-fun x () Real)\n"
+            "(declare-fun y () Real)\n"
+            "(declare-fun z () Real)\n"
+            "(minmax x y z :id g1 :signed)\n"
+        ))
+        cmd = script.commands[-1]
+        self.assertEqual(cmd.name, "minmax")
+        self.assertEqual([term.symbol_name() for term in cmd.args[0]], ['x', 'y', 'z'])
+        self.assertEqual(cmd.args[1], [(':id', 'g1'), (':signed', True)])
+
+        buf = StringIO()
+        script.serialize(buf)
+        self.assertIn("(minmax x y z :id g1 :signed)", buf.getvalue())
+
+    def test_parse_minmax_option_order(self):
+        parser = SmtLibParser()
+
+        script = parser.get_script(StringIO(
+            "(declare-fun x () Real)\n"
+            "(declare-fun y () Real)\n"
+            "(maxmin x y :signed :id g2)\n"
+        ))
+        cmd = script.commands[-1]
+        self.assertEqual(cmd.name, "maxmin")
+        self.assertEqual(cmd.args[1], [(':signed', True), (':id', 'g2')])
+
+        buf = StringIO()
+        script.serialize(buf)
+        self.assertIn("(maxmin x y :signed :id g2)", buf.getvalue())
+
+    def test_parse_minmax_reverse_option_order(self):
+        parser = SmtLibParser()
+
+        script = parser.get_script(StringIO(
+            "(declare-fun x () Real)\n"
+            "(declare-fun y () Real)\n"
+            "(minmax x y :signed :id g1)\n"
+        ))
+        cmd = script.commands[-1]
+        self.assertEqual(cmd.name, "minmax")
+        self.assertEqual(cmd.args[1], [(':signed', True), (':id', 'g1')])
+
+        buf = StringIO()
+        script.serialize(buf)
+        self.assertIn("(minmax x y :signed :id g1)", buf.getvalue())
+
+    def test_parse_minmax_maxmin_syntax_errors(self):
+        parser = SmtLibParser()
+        with self.assertRaises(PysmtSyntaxError):
+            parser.get_script(StringIO(
+                "(declare-fun x () Real)\n"
+                "(declare-fun y () Real)\n"
+                "(minmax x y :id)\n"
+            ))
+        with self.assertRaises(PysmtSyntaxError):
+            parser.get_script(StringIO(
+                "(declare-fun x () Real)\n"
+                "(declare-fun y () Real)\n"
+                "(maxmin x y :signed true)\n"
+            ))
+
+    def test_parse_minmax_maxmin_round_trip(self):
+        parser = SmtLibParser()
+        txt = """(declare-fun x () Real)
+(declare-fun y () Real)
+(minmax x y :id g1 :signed)
+(maxmin x y :signed :id g2)
+"""
+        script = parser.get_script(StringIO(txt))
+
+        buf = StringIO()
+        script.serialize(buf)
+        new_script = parser.get_script(StringIO(buf.getvalue()))
+
+        self.assertEqual(script.commands[-2].name, new_script.commands[-2].name)
+        self.assertEqual(script.commands[-2].args[1], new_script.commands[-2].args[1])
+        self.assertEqual(script.commands[-1].name, new_script.commands[-1].name)
+        self.assertEqual(script.commands[-1].args[1], new_script.commands[-1].args[1])
+
     def parse_from_file(self, file_id: int) -> SmtLibScript:
         fname = OMT_FILE_PATTERN % file_id
         reset_env()