Version bump for release 0.1.9 RC 3

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## 0.1.9 RC 5 (2018-04-22)
+## 0.1.9 RC 3 (2018-04-22)
 
 ### Features
 

app/main.cpp

@@ -72,7 +72,7 @@ int main(int argc, char **argv)
 
 	if (version)
 	{
-		std::cout << "anthem version 0.1.9-rc.5" << std::endl;
+		std::cout << "anthem version 0.1.9-rc.3" << std::endl;
 		return EXIT_SUCCESS;
 	}
 

examples/choice-rules.lp

@@ -1,2 +0,0 @@
-p(a).
-{q(a)}.

examples/graph-coloring.lp

@@ -1,18 +1,10 @@
-% assign a set of colors to each vertex
-{color(V, C)} :- vertex(V), color(C).
-
-% at most one color per vertex
-:- color(V, C1), color(V, C2), C1 != C2.
-
-% at least one color per vertex
-covered(V) :- color(V, _).
-:- vertex(V), not covered(V).
-
-% adjacent vertices don’t share the same color
-:- color(V1, C), color(V2, C), edge(V1, V2).
-
+#external color(1).
+#external edge(2).
+#external vertex(1).
 #show color/2.
 
-#external vertex(1).
-#external edge(2).
-#external color(1).
+{color(V, C)} :- vertex(V), color(C).
+covered(V) :- color(V, _).
+:- vertex(V), not covered(V).
+:- color(V1, C), color(V2, C), edge(V1, V2).
+:- color(V, C1), color(V, C2), C1 != C2.

examples/letters.lp

@@ -1,11 +0,0 @@
-letter(a).
-letter(b).
-letter(c).
-
-{p(1..3, Y)} :- letter(Y).
-:- p(X1, Y), p(X2, Y), X1 != X2.
-
-q(X) :- p(X, _).
-:- X = 1..3, not q(X).
-
-#show p/2.

examples/permutations.lp

@@ -1,4 +1,5 @@
 #show p/2.
+%#external integer(n(0)).
 
 {p(1..n, 1..n)}.
 

examples/prime.lp

@@ -1,4 +1,5 @@
+#show prime/1.
+%#external integer(n(0)).
+
 composite(I * J) :- I = 2..n, J = 2..n.
 prime(N) :- N = 2..n, not composite(N).
-
-#show prime/1.

examples/schur-numbers.lp

@@ -1,7 +1,9 @@
+#show in/2.
+%#external integer(n(0)).
+%#external integer(r(0)).
+
 {in(1..n, 1..r)}.
 covered(I) :- in(I, S).
 
 :- I = 1..n, not covered(I).
 :- in(I, S), in(J, S), in(I + J, S).
-
-#show in/2.

examples/simple-external-show.lp

@@ -1,9 +0,0 @@
-s(X) :- p(X).
-s(X) :- q(X).
-u(X) :- r(X), not s(X).
-
-#show u/1.
-
-#external p(1).
-#external q(1).
-#external r(1).

examples/simple-external.lp

@@ -1,5 +0,0 @@
-s(X) :- p(X).
-s(X) :- q(X).
-
-#external p(1).
-#external q(1).

include/anthem/Utils.h

@@ -13,7 +13,6 @@ namespace anthem
 constexpr const auto HeadVariablePrefix = "V";
 constexpr const auto BodyVariablePrefix = "X";
 constexpr const auto UserVariablePrefix = "U";
-constexpr const auto IntegerVariablePrefix = "N";
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 

include/anthem/output/AST.h

@@ -35,7 +35,6 @@ struct PrintContext
 	std::map<const VariableDeclaration *, size_t> userVariableIDs;
 	std::map<const VariableDeclaration *, size_t> headVariableIDs;
 	std::map<const VariableDeclaration *, size_t> bodyVariableIDs;
-	std::map<const VariableDeclaration *, size_t> integerVariableIDs;
 
 	const Context &context;
 };
@@ -323,6 +322,22 @@ inline output::ColorStream &print(output::ColorStream &stream, const Variable &v
 
 inline output::ColorStream &print(output::ColorStream &stream, const VariableDeclaration &variableDeclaration, PrintContext &printContext, bool)
 {
+	const auto domainSuffix =
+		[&variableDeclaration]()
+		{
+			switch (variableDeclaration.domain)
+			{
+				case Domain::Unknown:
+					return "";
+				case Domain::Noninteger:
+					return "n";
+				case Domain::Integer:
+					return "i";
+			}
+
+			return "";
+		};
+
 	const auto printVariableDeclaration =
 		[&](const auto *prefix, auto &variableIDs) -> output::ColorStream &
 		{
@@ -335,14 +350,11 @@ inline output::ColorStream &print(output::ColorStream &stream, const VariableDec
 				matchingVariableID = emplaceResult.first;
 			}
 
-			const auto variableName = std::string(prefix) + std::to_string(matchingVariableID->second);
+			const auto variableName = std::string(prefix) + std::to_string(matchingVariableID->second) + domainSuffix();
 
 			return (stream << output::Variable(variableName.c_str()));
 		};
 
-	if (variableDeclaration.domain == Domain::Integer)
-		return printVariableDeclaration(IntegerVariablePrefix, printContext.integerVariableIDs);
-
 	switch (variableDeclaration.type)
 	{
 		case VariableDeclaration::Type::UserDefined:

src/anthem/Translation.cpp

@@ -155,7 +155,7 @@ void translate(const char *fileName, std::istream &stream, Context &context)
 				<< "(" << predicateDeclaration->name
 				<< "/" << output::Number(predicateDeclaration->arity())
 				<< "@" << output::Number(i + 1)
-				<< ")" << std::endl;
+				<< ")." << std::endl;
 		}
 	}
 }