Fixed CL -project not printing bug.

Ray Hu · Ray Hu · commit b6124f67f4aa · 2016-11-29T12:14:53.000Z
diff --git a/README b/README
@@ -93,5 +93,6 @@ Alternative command line usage:
 To run the Scribble tool directly via java (from Nick Ng)
 
   $ mvn dependency:build-classpath -Dmdep.outputFile=classpath
-  $ java -cp $(cat dist/classpath) org.scribble.cli.CommandLine [args] MyModule.scr
+  $ java -cp $(cat dist/classpath)
+        org.scribble.cli.CommandLine [args] MyModule.scr
 
diff --git a/modules/cli/src/main/java/org/scribble/cli/CommandLineArgParser.java b/modules/cli/src/main/java/org/scribble/cli/CommandLineArgParser.java
@@ -59,7 +59,7 @@ public class CommandLineArgParser
 
 	private static final Map<String, CommandLine.ArgFlag> NON_UNIQUE_FLAGS = new HashMap<>();
 	{
-		CommandLineArgParser.UNIQUE_FLAGS.put(CommandLineArgParser.PROJECT_FLAG, CommandLine.ArgFlag.PROJECT);
+		CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.PROJECT_FLAG, CommandLine.ArgFlag.PROJECT);
 		CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.EFSM_FLAG, CommandLine.ArgFlag.EFSM);
 		CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.VALIDATION_EFSM_FLAG, CommandLine.ArgFlag.VALIDATION_EFSM);
 		CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.UNFAIR_EFSM_FLAG, CommandLine.ArgFlag.UNFAIR_EFSM);
diff --git a/modules/core/src/test/scrib/tmp/Test.scr b/modules/core/src/test/scrib/tmp/Test.scr
@@ -28,12 +28,34 @@ module Test;
 // Add a unit test for validation to bypass aux
 
 
+global protocol Proto1(role A, role B, role C)
+{
+	rec X
+	{
+		1() from B to A;
+		choice at B  // Testing projection, A not syntactically in this choice but cannot discard the X -- handled by UnfoldingVisitor(?)
+		{
+			2() from B to C;
+			continue X;
+		}
+//		or  // Testing 
+//		{
+//			3() from B to C;
+//		}
+	}
+}
+//*/
+
+
+/*
 explicit global protocol Proto1(role A, role B, role C)
 {
 	1() connect A to B;
 	1() connect B to C;
 	1() connect C to A;  // Testing accept-correlation check
 }
+//*/
+
 
 /*
 global protocol Proto1(role A, role B)

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public class CommandLineArgParser`
`59`	`59`
`60`	`60`	`private static final Map<String, CommandLine.ArgFlag> NON_UNIQUE_FLAGS = new HashMap<>();`
`61`	`61`	`{`
`62`		`- CommandLineArgParser.UNIQUE_FLAGS.put(CommandLineArgParser.PROJECT_FLAG, CommandLine.ArgFlag.PROJECT);`
	`62`	`+ CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.PROJECT_FLAG, CommandLine.ArgFlag.PROJECT);`
`63`	`63`	`CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.EFSM_FLAG, CommandLine.ArgFlag.EFSM);`
`64`	`64`	`CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.VALIDATION_EFSM_FLAG, CommandLine.ArgFlag.VALIDATION_EFSM);`
`65`	`65`	`CommandLineArgParser.NON_UNIQUE_FLAGS.put(CommandLineArgParser.UNFAIR_EFSM_FLAG, CommandLine.ArgFlag.UNFAIR_EFSM);`