debian/changelog

-bali-phy (3.1.1+dfsg-1) UNRELEASED; urgency=medium
+bali-phy (3.1.2+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dylan Aïssi ]
   * Team upload.
@@ -14,7 +14,11 @@ bali-phy (3.1.1+dfsg-1) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * Add missing Build-Depends: python
 
- -- Benjamin Redelings <benjamin.redelings@gmail.com>  Sat, 05 May 2018 08:05:07 -0400
+  [ Benjamin Redelings ]
+  * New upstream version 3.1.2+dfsg
+  * Run tests with python3 instead of depending on python2.
+
+ -- Benjamin Redelings <benjamin.redelings@gmail.com>  Sun, 06 May 2018 07:53:09 -0400
 
 bali-phy (3.0.3+dfsg-1) unstable; urgency=medium
 

debian/control

@@ -14,8 +14,7 @@ Build-Depends: debhelper (>= 11),
                libboost-random-dev,
                libboost-system-dev,
                libboost-filesystem-dev,
-               libboost-chrono-dev,
-               python
+               libboost-chrono-dev
 Standards-Version: 4.1.4
 Vcs-Browser: https://salsa.debian.org/med-team/bali-phy
 Vcs-Git: https://salsa.debian.org/med-team/bali-phy.git

debian/patches/series

+test-python3

debian/patches/test-python3

+Index: bali-phy/tests/run-tests.py
+===================================================================
+--- bali-phy.orig/tests/run-tests.py
++++ bali-phy/tests/run-tests.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ from __future__ import print_function
+ import subprocess
+ import os

src/parser/parse.cc

@@ -754,7 +754,7 @@ struct HParser : qi::grammar<Iterator, expression_ref()>
 
 	    /*------ Section 4 -------*/
 	    module = 
-		-(tok.KW_Module > modid[ push_back(_a,construct<String>(_1)) ] > /*-exports >>*/ tok.KW_Where) > body [ push_back(_a,_1) ] >> eps[ _val = new_<expression>(AST_node("Module"), _a) ];
+		-(tok.KW_Module > modid[ push_back(_a,construct<String>(_1)) ] >> -exports >> tok.KW_Where) > body [ push_back(_a,_1) ] >> eps[ _val = new_<expression>(AST_node("Module"), _a) ];
 
 	    body = 
 		tok.LeftCurly >> impdecls[ push_back(_a,_1) ] >> tok.SemiColon > topdecls[ push_back(_a,_1) ] > tok.RightCurly >> eps[ _val = new_<expression>(AST_node("Body"), _a) ]
@@ -870,15 +870,16 @@ struct HParser : qi::grammar<Iterator, expression_ref()>
 	    impdecls = impdecl[push_back(_a,_1)] % tok.SemiColon >> eps [ _val = new_<expression>(AST_node("impdecls"), _a)  ];
 	
 	    /*------ Section 5.2 -------*/
-	    /*
-	      exports = tok.LeftParen >> tok.RightParen | tok.LeftParen>> h_export % tok.Comma >> -tok.Comma >> tok.RightParen;
-	      h_export = 
-	      qvar
-	      | qtycon >> -(tok.LeftParen >> tok.DotDot >> tok.RightParen | tok.LeftParen >> tok.RightParen | tok.LeftParen >> cname %tok.Comma >> tok.RightParen)
-	      | qtycls >> -(tok.LeftParen >> tok.DotDot >> tok.RightParen | tok.LeftParen >> tok.RightParen | tok.LeftParen >> var %tok.Comma >> tok.RightParen)
-	      | "module" >> modid
+
+	    exports = tok.LeftParen [clear(_a)] >> tok.RightParen [_val = new_<expression>(AST_node("exports"),_a)]
+		| tok.LeftParen [clear(_a)] >> h_export [push_back(_a,_1)] % tok.Comma >> -tok.Comma >> tok.RightParen ;
+
+	    h_export = 	qvar [_val = construct<AST_node>(std::string("qvar"), construct<String>(_1)) ]
+//		| qtycon >> -(tok.LeftParen >> tok.DotDot >> tok.RightParen | tok.LeftParen >> tok.RightParen | tok.LeftParen >> cname %tok.Comma >> tok.RightParen)
+//		| qtycls >> -(tok.LeftParen >> tok.DotDot >> tok.RightParen | tok.LeftParen >> tok.RightParen | tok.LeftParen >> var %tok.Comma >> tok.RightParen)
+		| tok.KW_Module >> modid [_val = construct<AST_node>(std::string("module"), construct<String>(_1)) ]
 	      ;
-	    */
+
 	    cname = var | con;
 	
 	    /*------ Section 5.3 -------*/
@@ -925,6 +926,7 @@ struct HParser : qi::grammar<Iterator, expression_ref()>
 	    add_error_handler(stmt);
 	    add_error_handler(topdecls);
 	    add_error_handler(topdecl);
+	    add_error_handler(exports);
 	    add_error_handler(module);
 	    add_error_handler(body);
 	    add_error_handler(pat);
@@ -960,6 +962,7 @@ struct HParser : qi::grammar<Iterator, expression_ref()>
 
 	    BOOST_SPIRIT_DEBUG_NODE(modid);
 	    BOOST_SPIRIT_DEBUG_NODE(module);
+	    BOOST_SPIRIT_DEBUG_NODE(exports);
 	    BOOST_SPIRIT_DEBUG_NODE(body);
 	    BOOST_SPIRIT_DEBUG_NODE(topdecls);
 	    BOOST_SPIRIT_DEBUG_NODE(topdecl);
@@ -1033,6 +1036,7 @@ struct HParser : qi::grammar<Iterator, expression_ref()>
 	    topdecls.name("topdecls");
 	    topdecl.name("topdecl");
 	    impdecls.name("impdecls");
+	    exports.name("exports");
 	    impdecl.name("impdecl");
 	    gendecl.name("gendecl");
 	    ops.name("ops");
@@ -1177,8 +1181,8 @@ struct HParser : qi::grammar<Iterator, expression_ref()>
     qi::rule<Iterator, expression_ref(), qi::locals<vector<expression_ref>>> impdecls;
 
     /*----- Section 5.2 ------*/
-    qi::rule<Iterator, std::string()> exports;
-    qi::rule<Iterator, std::string()> h_export;
+    qi::rule<Iterator, expression_ref(), qi::locals<vector<expression_ref>>> exports;
+    qi::rule<Iterator, expression_ref(), qi::locals<vector<expression_ref>>> h_export;
     qi::rule<Iterator, std::string()> cname;
 
     /*----- Section 5.3 ------*/

tests/run-tests.py

@@ -174,7 +174,8 @@ class Tester:
         if expected is None:
             return True;
         else:
-            return expected == self.read_obtained(test_subdir, name)
+            obtained = self.read_obtained(test_subdir, name)
+            return set(expected.splitlines()).issubset(set(obtained.splitlines()))
 
     def check_likelihood(self, test_subdir):
         import math