Rhu1/rhu1 pr tidying

modules/cli/src/main/java/org/scribble/main/MainContext.java

@@ -13,8 +13,8 @@
 import org.scribble.main.resource.Resource;
 import org.scribble.main.resource.ResourceLocator;
 import org.scribble.parser.AntlrParser;
-import org.scribble.parser.ScribbleModuleLoader;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribModuleLoader;
+import org.scribble.parser.ScribParser;
 import org.scribble.sesstype.name.ModuleName;
 import org.scribble.util.Pair;
 
@@ -31,10 +31,10 @@ public class MainContext
 
 	// Only "manually" used here for loading main module (which should be factored out to front end) -- otherwise, only used within loader
 	private final AntlrParser antlrParser;  // Not encapsulated inside ScribbleParser, because ScribbleParser's main function is to "parse" ANTLR CommonTrees into ModelNodes
-	private final ScribbleParser scribParser;
+	private final ScribParser scribParser;
 
 	private final ResourceLocator locator;  // Path -> Resource
-	private final ScribbleModuleLoader loader;  // sesstype.ModuleName -> Pair<Resource, Module>
+	private final ScribModuleLoader loader;  // sesstype.ModuleName -> Pair<Resource, Module>
 
 	// ModuleName keys are full module names -- parsed are the modules read from file, distinguished from the generated projection modules
 	// Resource recorded for source path
@@ -45,9 +45,9 @@ public MainContext(boolean debug, ResourceLocator locator, Path mainpath)
 	{
 		this.debug = debug;
 		this.antlrParser = new AntlrParser();
-		this.scribParser = new ScribbleParser();
+		this.scribParser = new ScribParser();
 		this.locator = locator; 
-		this.loader = new ScribbleModuleLoader(this.locator, this.antlrParser, this.scribParser);
+		this.loader = new ScribModuleLoader(this.locator, this.antlrParser, this.scribParser);
 
 		Pair<Resource, Module> p = loadMainModule(mainpath);
 		this.main = p.right.getFullModuleName();

modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble2.g → modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble.g

@@ -3,7 +3,7 @@
  */
 
 
-grammar Scribble2;
+grammar Scribble;
 
 
 options

modules/parser/src/main/java/org/scribble/parser/AntlrParser.java

@@ -8,8 +8,8 @@
 import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.tree.CommonTree;
 import org.scribble.main.resource.Resource;
-import org.scribble.parser.antlr.Scribble2Lexer;
-import org.scribble.parser.antlr.Scribble2Parser;
+import org.scribble.parser.antlr.ScribbleLexer;
+import org.scribble.parser.antlr.ScribbleParser;
 
 // Resource -> ANTLR CommonTree
 // Parses Resources into ANTLR CommonTrees
@@ -26,8 +26,8 @@ public CommonTree parseAntlrTree(Resource res)
 		try
 		{
 			String input = new String(readResource(res));
-			Scribble2Lexer lex = new Scribble2Lexer(new ANTLRStringStream(input));
-			Scribble2Parser parser = new Scribble2Parser(new CommonTokenStream(lex));
+			ScribbleLexer lex = new ScribbleLexer(new ANTLRStringStream(input));
+			ScribbleParser parser = new ScribbleParser(new CommonTokenStream(lex));
 			return (CommonTree) parser.module().getTree();
 		}
 		catch (RecognitionException e)

modules/parser/src/main/java/org/scribble/parser/ScribbleModuleLoader.java → modules/parser/src/main/java/org/scribble/parser/ScribModuleLoader.java

@@ -26,13 +26,13 @@
 // loading = ModuleName -> Module
 //   ModuleName --> Path --ResourceLocator--> Resource --AntlrParser--> ANTLR --ScribParser--> ScribNode
 // FIXME: should be in core org.scribble.main -- here due to Maven dependency restrictions
-public class ScribbleModuleLoader extends DefaultModuleLoader //implements ModuleLoader
+public class ScribModuleLoader extends DefaultModuleLoader //implements ModuleLoader
 {
 	private ResourceLocator locator;
 	private AntlrParser antlr;
-	private ScribbleParser parser;
+	private ScribParser parser;
 
-	public ScribbleModuleLoader(ResourceLocator locator, AntlrParser antlr, ScribbleParser parser)
+	public ScribModuleLoader(ResourceLocator locator, AntlrParser antlr, ScribParser parser)
 	{
 		this.locator = locator;
 		this.antlr = antlr;

modules/parser/src/main/java/org/scribble/parser/ScribbleParser.java → modules/parser/src/main/java/org/scribble/parser/ScribParser.java

@@ -38,9 +38,9 @@
 
 // ANTLR CommonTree -> ScribNode
 // Parses ANTLR nodes into ScribNodes using the parser.ast.Antlr[...] helper classes
-public class ScribbleParser
+public class ScribParser
 {
-	public ScribbleParser()
+	public ScribParser()
 	{
 
 	}

modules/parser/src/main/java/org/scribble/parser/ast/AntlrDataTypeDecl.java

@@ -4,7 +4,7 @@
 import org.scribble.ast.DataTypeDecl;
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.name.qualified.DataTypeNameNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 
 public class AntlrDataTypeDecl
@@ -14,7 +14,7 @@ public class AntlrDataTypeDecl
 	public static final int SOURCE_CHILD_INDEX = 2;
 	public static final int ALIAS_CHILD_INDEX = 3;
 
-	public static DataTypeDecl parseDataTypeDecl(ScribbleParser parser, CommonTree ct)
+	public static DataTypeDecl parseDataTypeDecl(ScribParser parser, CommonTree ct)
 	{
 		CommonTree tmp1 = getSchemaChild(ct);
 		String schema = AntlrSimpleName.getName(tmp1);

modules/parser/src/main/java/org/scribble/parser/ast/AntlrImportModule.java

@@ -4,7 +4,7 @@
 import org.scribble.ast.ImportModule;
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.name.qualified.ModuleNameNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrQualifiedName;
 
 public class AntlrImportModule
@@ -14,7 +14,7 @@ public class AntlrImportModule
 
 	private static final String EMPTY_ALIAS = "EMPTY_ALIAS";
 
-	public static ImportModule parseImportModule(ScribbleParser parser, CommonTree ct)
+	public static ImportModule parseImportModule(ScribParser parser, CommonTree ct)
 	{
 		ModuleNameNode fmn = AntlrQualifiedName.toModuleNameNode(getModuleNameChild(ct));
 		ModuleNameNode alias =

modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSig.java

@@ -5,15 +5,15 @@
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.PayloadElemList;
 import org.scribble.ast.name.simple.OpNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 
 public class AntlrMessageSig
 {
 	public static final int OPERATOR_CHILD_INDEX = 0;
 	public static final int PAYLOAD_CHILD_INDEX = 1;
 
-	public static MessageSigNode parseMessageSig(ScribbleParser parser, CommonTree ct)
+	public static MessageSigNode parseMessageSig(ScribParser parser, CommonTree ct)
 	{
 		OpNode op = AntlrSimpleName.toOpNode(getOpChild(ct));
 		PayloadElemList payload = (PayloadElemList) parser.parse(getPayloadElemListChild(ct));

modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSigDecl.java

@@ -4,7 +4,7 @@
 import org.scribble.ast.MessageSigNameDecl;
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.name.qualified.MessageSigNameNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 
 // FIXME: factor out with AntlrDataTypeDecl
@@ -15,7 +15,7 @@ public class AntlrMessageSigDecl
 	public static final int SOURCE_CHILD_INDEX = 2;
 	public static final int ALIAS_CHILD_INDEX = 3;
 
-	public static MessageSigNameDecl parseMessageSigDecl(ScribbleParser parser, CommonTree ct)
+	public static MessageSigNameDecl parseMessageSigDecl(ScribParser parser, CommonTree ct)
 	{
 		CommonTree tmp1 = getSchemaChild(ct);
 		String schema = AntlrSimpleName.getName(tmp1);

modules/parser/src/main/java/org/scribble/parser/ast/AntlrModule.java

@@ -13,14 +13,14 @@
 import org.scribble.ast.NonProtocolDecl;
 import org.scribble.ast.ProtocolDecl;
 import org.scribble.parser.AntlrConstants.AntlrNodeType;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.util.ScribParserUtil;
 
 public class AntlrModule
 {
 	public static final int MODULEDECL_CHILD_INDEX = 0;
 
-	public static Module parseModule(ScribbleParser parser, CommonTree ct)
+	public static Module parseModule(ScribParser parser, CommonTree ct)
 	{
 		ModuleDecl md = (ModuleDecl) parser.parse(getModuleDeclChild(ct));
 		List<ImportDecl<?>> ids = new LinkedList<>();

modules/parser/src/main/java/org/scribble/parser/ast/AntlrModuleDecl.java

@@ -3,14 +3,14 @@
 import org.antlr.runtime.tree.CommonTree;
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.ModuleDecl;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrQualifiedName;
 
 public class AntlrModuleDecl
 {
 	public static final int MODULENAME_CHILD_INDEX = 0;
 
-	public static ModuleDecl parseModuleDecl(ScribbleParser parser, CommonTree ct)
+	public static ModuleDecl parseModuleDecl(ScribParser parser, CommonTree ct)
 	{
 		return AstFactoryImpl.FACTORY.ModuleDecl(AntlrQualifiedName.toModuleNameNode(getModuleNameChild(ct)));
 	}

modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleArgList.java

@@ -12,22 +12,22 @@
 import org.scribble.ast.name.qualified.DataTypeNameNode;
 import org.scribble.ast.name.simple.AmbigNameNode;
 import org.scribble.parser.AntlrConstants.AntlrNodeType;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrAmbigName;
 import org.scribble.parser.ast.name.AntlrQualifiedName;
 import org.scribble.parser.util.ScribParserUtil;
 
 public class AntlrNonRoleArgList
 {
 	// Similar to AntlrPayloadElemList
-	public static NonRoleArgList parseNonRoleArgList(ScribbleParser parser, CommonTree ct)
+	public static NonRoleArgList parseNonRoleArgList(ScribParser parser, CommonTree ct)
 	{
 		List<NonRoleArg> as = getArgumentChildren(ct).stream().map((a) -> parseNonRoleArg(parser, a)).collect(Collectors.toList());
 		return AstFactoryImpl.FACTORY.NonRoleArgList(as);
 	}
 
 	// Not in own class because not called by ScribbleParser -- called directly from above
-	private static NonRoleArg parseNonRoleArg(ScribbleParser parser, CommonTree ct)
+	private static NonRoleArg parseNonRoleArg(ScribParser parser, CommonTree ct)
 	{
 		AntlrNodeType type = ScribParserUtil.getAntlrNodeType(ct);
 		if (type == AntlrNodeType.MESSAGESIGNATURE)

modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDecl.java

@@ -5,7 +5,7 @@
 import org.scribble.ast.NonRoleParamDecl;
 import org.scribble.ast.name.simple.NonRoleParamNode;
 import org.scribble.parser.AntlrConstants;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 import org.scribble.sesstype.kind.DataTypeKind;
 import org.scribble.sesstype.kind.Kind;
@@ -17,7 +17,7 @@ public class AntlrNonRoleParamDecl
 	public static final int KIND_CHILD_INDEX = 0;
 	public static final int NAME_CHILD_INDEX = 1;
 
-	public static NonRoleParamDecl<? extends NonRoleParamKind> parseNonRoleParamDecl(ScribbleParser parser, CommonTree ct)
+	public static NonRoleParamDecl<? extends NonRoleParamKind> parseNonRoleParamDecl(ScribParser parser, CommonTree ct)
 	{
 		Kind kind = parseKind(getKindChild(ct));
 		if (kind.equals(SigKind.KIND))

modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDeclList.java

@@ -8,13 +8,13 @@
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.NonRoleParamDecl;
 import org.scribble.ast.NonRoleParamDeclList;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.util.ScribParserUtil;
 import org.scribble.sesstype.kind.NonRoleParamKind;
 
 public class AntlrNonRoleParamDeclList
 {
-	public static NonRoleParamDeclList parseNonRoleParamDeclList(ScribbleParser parser, CommonTree ct)
+	public static NonRoleParamDeclList parseNonRoleParamDeclList(ScribParser parser, CommonTree ct)
 	{
 		List<NonRoleParamDecl<NonRoleParamKind>> pds = new LinkedList<>();
 		for (CommonTree pd : getParamDeclChildren(ct))

modules/parser/src/main/java/org/scribble/parser/ast/AntlrPayloadElemList.java

@@ -11,15 +11,15 @@
 import org.scribble.ast.name.qualified.DataTypeNameNode;
 import org.scribble.ast.name.simple.AmbigNameNode;
 import org.scribble.parser.AntlrConstants.AntlrNodeType;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrAmbigName;
 import org.scribble.parser.ast.name.AntlrQualifiedName;
 import org.scribble.parser.util.ScribParserUtil;
 
 public class AntlrPayloadElemList
 {
 	// Cf. AntlrNonRoleArgList
-	public static PayloadElemList parsePayloadElemList(ScribbleParser parser, CommonTree ct)
+	public static PayloadElemList parsePayloadElemList(ScribParser parser, CommonTree ct)
 	{
 		// As in AntlrNonRoleArgList, i.e. payloadelem (NonRoleArg) not directly parsed -- cf. rolearg and nonroleparamdecl, which are directly parsed (not consistent), due to amibgious names
 		List<PayloadElem> pes = getPayloadElements(ct).stream().map((pe) -> parsePayloadElem(pe)).collect(Collectors.toList());

modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArg.java

@@ -4,14 +4,14 @@
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.RoleArg;
 import org.scribble.ast.name.simple.RoleNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 
 public class AntlrRoleArg
 {
 	public static final int ARG_CHILD_INDEX = 0;
 
-	public static RoleArg parseRoleArg(ScribbleParser parser, CommonTree ct)
+	public static RoleArg parseRoleArg(ScribParser parser, CommonTree ct)
 	{
 		RoleNode role = AntlrSimpleName.toRoleNode(getArgChild(ct));
 		return AstFactoryImpl.FACTORY.RoleArg(role);

modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArgList.java

@@ -7,12 +7,12 @@
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.RoleArg;
 import org.scribble.ast.RoleArgList;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.util.ScribParserUtil;
 
 public class AntlrRoleArgList
 {
-	public static RoleArgList parseRoleArgList(ScribbleParser parser, CommonTree ct)
+	public static RoleArgList parseRoleArgList(ScribParser parser, CommonTree ct)
 	{
 		List<RoleArg> ris = getRoleInstantiationChildren(ct).stream().map((ri) -> (RoleArg) parser.parse(ri)).collect(Collectors.toList());
 		return AstFactoryImpl.FACTORY.RoleArgList(ris);

modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDecl.java

@@ -4,15 +4,15 @@
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.RoleDecl;
 import org.scribble.ast.name.simple.RoleNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 
 public class AntlrRoleDecl
 {
 	public static final int NAME_CHILD_INDEX = 0;
 
 	//public static RoleNode parseRoleDecl(AntlrModuleParser parser, CommonTree ct)
-	public static RoleDecl parseRoleDecl(ScribbleParser parser, CommonTree ct)
+	public static RoleDecl parseRoleDecl(ScribParser parser, CommonTree ct)
 	{
 		RoleNode name = AntlrSimpleName.toRoleNode(getNameChild(ct));
 		return AstFactoryImpl.FACTORY.RoleDecl(name);

modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDeclList.java

@@ -7,12 +7,12 @@
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.RoleDecl;
 import org.scribble.ast.RoleDeclList;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.util.ScribParserUtil;
 
 public class AntlrRoleDeclList
 {
-	public static RoleDeclList parseRoleDeclList(ScribbleParser parser, CommonTree ct)
+	public static RoleDeclList parseRoleDeclList(ScribParser parser, CommonTree ct)
 	{
 		List<RoleDecl> rds = getRoleDeclChildren(ct).stream().map((pd) -> (RoleDecl) parser.parse(pd)).collect(Collectors.toList());
 		return AstFactoryImpl.FACTORY.RoleDeclList(rds);

modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGChoice.java

@@ -8,7 +8,7 @@
 import org.scribble.ast.global.GChoice;
 import org.scribble.ast.global.GProtocolBlock;
 import org.scribble.ast.name.simple.RoleNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 import org.scribble.parser.util.ScribParserUtil;
 
@@ -17,7 +17,7 @@ public class AntlrGChoice
 	public static final int SUBJECT_CHILD_INDEX = 0;
 	public static final int BLOCK_CHILDREN_START_INDEX = 1;
 
-	public static GChoice parseGChoice(ScribbleParser parser, CommonTree ct)
+	public static GChoice parseGChoice(ScribParser parser, CommonTree ct)
 	{
 		RoleNode subj = AntlrSimpleName.toRoleNode(getSubjectChild(ct));
 		List<GProtocolBlock> blocks =

modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGContinue.java

@@ -4,14 +4,14 @@
 import org.scribble.ast.AstFactoryImpl;
 import org.scribble.ast.global.GContinue;
 import org.scribble.ast.name.simple.RecVarNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrSimpleName;
 
 public class AntlrGContinue
 {
 	public static final int LABEL_CHILD_INDEX = 0;
 
-	public static GContinue parseGContinue(ScribbleParser parser, CommonTree ct)
+	public static GContinue parseGContinue(ScribParser parser, CommonTree ct)
 	{
 		RecVarNode recvar = AntlrSimpleName.toRecVarNode(getRecVarChild(ct));
 		return AstFactoryImpl.FACTORY.GContinue(recvar);

modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGDo.java

@@ -6,7 +6,7 @@
 import org.scribble.ast.RoleArgList;
 import org.scribble.ast.global.GDo;
 import org.scribble.ast.name.qualified.GProtocolNameNode;
-import org.scribble.parser.ScribbleParser;
+import org.scribble.parser.ScribParser;
 import org.scribble.parser.ast.name.AntlrQualifiedName;
 
 public class AntlrGDo
@@ -15,7 +15,7 @@ public class AntlrGDo
 	public static final int ARGUMENTLIST_CHILD_INDEX = 1;
 	public static final int ROLEINSTANTIATIONLIST_CHILD_INDEX = 2;
 
-	public static GDo parseGDo(ScribbleParser parser, CommonTree ct)
+	public static GDo parseGDo(ScribParser parser, CommonTree ct)
 	{
 		RoleArgList ril = (RoleArgList) parser.parse(getRoleArgListChild(ct));
 		NonRoleArgList al = (NonRoleArgList) parser.parse(getNonRoleArgListChild(ct));