diff --git a/modules/cli/src/main/java/org/scribble/main/MainContext.java b/modules/cli/src/main/java/org/scribble/main/MainContext.java index b9de85155..cff35ffe4 100755 --- a/modules/cli/src/main/java/org/scribble/main/MainContext.java +++ b/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 + private final ScribModuleLoader loader; // sesstype.ModuleName -> Pair // 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 p = loadMainModule(mainpath); this.main = p.right.getFullModuleName(); diff --git a/modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble2.g b/modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble.g similarity index 95% rename from modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble2.g rename to modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble.g index 335d4ef04..075dc16cb 100755 --- a/modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble2.g +++ b/modules/parser/src/main/antlr3/org/scribble/parser/antlr/Scribble.g @@ -3,7 +3,7 @@ */ -grammar Scribble2; +grammar Scribble; options diff --git a/modules/parser/src/main/java/org/scribble/parser/AntlrParser.java b/modules/parser/src/main/java/org/scribble/parser/AntlrParser.java index d007ce724..bce3d377c 100755 --- a/modules/parser/src/main/java/org/scribble/parser/AntlrParser.java +++ b/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) diff --git a/modules/parser/src/main/java/org/scribble/parser/ScribbleModuleLoader.java b/modules/parser/src/main/java/org/scribble/parser/ScribModuleLoader.java similarity index 90% rename from modules/parser/src/main/java/org/scribble/parser/ScribbleModuleLoader.java rename to modules/parser/src/main/java/org/scribble/parser/ScribModuleLoader.java index f4967b609..80730d7db 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ScribbleModuleLoader.java +++ b/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; diff --git a/modules/parser/src/main/java/org/scribble/parser/ScribbleParser.java b/modules/parser/src/main/java/org/scribble/parser/ScribParser.java similarity index 96% rename from modules/parser/src/main/java/org/scribble/parser/ScribbleParser.java rename to modules/parser/src/main/java/org/scribble/parser/ScribParser.java index 8b92eab9f..c753fbc75 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ScribbleParser.java +++ b/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() { } diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrDataTypeDecl.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrDataTypeDecl.java index 689b3f41c..8a3999e27 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrDataTypeDecl.java +++ b/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); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrImportModule.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrImportModule.java index 514d89617..acb725396 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrImportModule.java +++ b/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 = diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSig.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSig.java index 3b2913638..ae70c7bef 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSig.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSig.java @@ -5,7 +5,7 @@ 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 @@ -13,7 +13,7 @@ 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)); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSigDecl.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSigDecl.java index 1789efbf9..e2c72e95b 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrMessageSigDecl.java +++ b/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); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrModule.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrModule.java index 36f82af83..12f2c02d8 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrModule.java +++ b/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> ids = new LinkedList<>(); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrModuleDecl.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrModuleDecl.java index 5069eb49e..7e22323bb 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrModuleDecl.java +++ b/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))); } diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleArgList.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleArgList.java index 7d1520d7f..d9d076d1d 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleArgList.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleArgList.java @@ -12,7 +12,7 @@ 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; @@ -20,14 +20,14 @@ public class AntlrNonRoleArgList { // Similar to AntlrPayloadElemList - public static NonRoleArgList parseNonRoleArgList(ScribbleParser parser, CommonTree ct) + public static NonRoleArgList parseNonRoleArgList(ScribParser parser, CommonTree ct) { List 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) diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDecl.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDecl.java index 92466af8a..5426fdd85 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDecl.java +++ b/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 parseNonRoleParamDecl(ScribbleParser parser, CommonTree ct) + public static NonRoleParamDecl parseNonRoleParamDecl(ScribParser parser, CommonTree ct) { Kind kind = parseKind(getKindChild(ct)); if (kind.equals(SigKind.KIND)) diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDeclList.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDeclList.java index 0ce90e0f0..09c51e605 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrNonRoleParamDeclList.java +++ b/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> pds = new LinkedList<>(); for (CommonTree pd : getParamDeclChildren(ct)) diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrPayloadElemList.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrPayloadElemList.java index 217615e91..ce729c9bf 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrPayloadElemList.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrPayloadElemList.java @@ -11,7 +11,7 @@ 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; @@ -19,7 +19,7 @@ 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 pes = getPayloadElements(ct).stream().map((pe) -> parsePayloadElem(pe)).collect(Collectors.toList()); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArg.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArg.java index b0be67b93..23d1a34ac 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArg.java +++ b/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); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArgList.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArgList.java index 34f92d587..2a765d7b3 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleArgList.java +++ b/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 ris = getRoleInstantiationChildren(ct).stream().map((ri) -> (RoleArg) parser.parse(ri)).collect(Collectors.toList()); return AstFactoryImpl.FACTORY.RoleArgList(ris); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDecl.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDecl.java index 82b92bc4a..4ffce3c86 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDecl.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDecl.java @@ -4,7 +4,7 @@ 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 @@ -12,7 +12,7 @@ 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); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDeclList.java b/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDeclList.java index 167f77e0c..46165ca79 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/AntlrRoleDeclList.java +++ b/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 rds = getRoleDeclChildren(ct).stream().map((pd) -> (RoleDecl) parser.parse(pd)).collect(Collectors.toList()); return AstFactoryImpl.FACTORY.RoleDeclList(rds); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGChoice.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGChoice.java index 49bce6781..8b56e67fd 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGChoice.java +++ b/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 blocks = diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGContinue.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGContinue.java index d4e0f16da..c1fde4ed9 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGContinue.java +++ b/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); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGDo.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGDo.java index b3fa61829..82b3d9fda 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGDo.java +++ b/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)); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInteractionSequence.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInteractionSequence.java index 9ec3f1e66..232dd61f1 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInteractionSequence.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInteractionSequence.java @@ -8,12 +8,12 @@ import org.scribble.ast.AstFactoryImpl; import org.scribble.ast.global.GInteractionNode; import org.scribble.ast.global.GInteractionSeq; -import org.scribble.parser.ScribbleParser; +import org.scribble.parser.ScribParser; import org.scribble.parser.util.ScribParserUtil; public class AntlrGInteractionSequence { - public static GInteractionSeq parseGInteractionSequence(ScribbleParser parser, CommonTree ct) + public static GInteractionSeq parseGInteractionSequence(ScribParser parser, CommonTree ct) { List gis = getInteractionChildren(ct).stream().map((gi) -> (GInteractionNode) parser.parse(gi)).collect(Collectors.toList()); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterrupt.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterrupt.java index 84759082f..cbc896d23 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterrupt.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterrupt.java @@ -7,7 +7,7 @@ import org.scribble.ast.MessageNode; import org.scribble.ast.global.GInterrupt; 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 AntlrGInterrupt public static final int SOURCE_CHILD_INDEX = 0; public static final int MESSAGE_CHILDREN_START_INDEX = 1; - public static GInterrupt parseGInterrupt(ScribbleParser parser, CommonTree ct) + public static GInterrupt parseGInterrupt(ScribParser parser, CommonTree ct) { RoleNode src = AntlrSimpleName.toRoleNode(getSourceChild(ct)); List msgs = diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterruptible.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterruptible.java index b0d1256a2..de62c13ea 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterruptible.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGInterruptible.java @@ -8,7 +8,7 @@ import org.scribble.ast.global.GInterruptible; import org.scribble.ast.global.GProtocolBlock; import org.scribble.ast.name.simple.ScopeNode; -import org.scribble.parser.ScribbleParser; +import org.scribble.parser.ScribParser; import org.scribble.parser.ast.name.AntlrSimpleName; import org.scribble.parser.util.ScribParserUtil; @@ -18,7 +18,7 @@ public class AntlrGInterruptible public static final int BLOCK_CHILD_INDEX = 1; public static final int INTERRUPT_CHILDREN_START_INDEX = 2; - public static GInterruptible parseGInterruptible(ScribbleParser parser, CommonTree ct) + public static GInterruptible parseGInterruptible(ScribParser parser, CommonTree ct) { GProtocolBlock block = (GProtocolBlock) parser.parse(getBlockChild(ct)); List interrs = diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGMessageTransfer.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGMessageTransfer.java index a5a217d8a..f93721746 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGMessageTransfer.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGMessageTransfer.java @@ -10,7 +10,7 @@ import org.scribble.ast.global.GMessageTransfer; import org.scribble.ast.name.simple.RoleNode; 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.ast.name.AntlrSimpleName; @@ -22,7 +22,7 @@ public class AntlrGMessageTransfer public static final int SOURCE_CHILD_INDEX = 1; public static final int DESTINATION_CHILDREN_START_INDEX = 2; - public static GMessageTransfer parseGMessageTransfer(ScribbleParser parser, CommonTree ct) + public static GMessageTransfer parseGMessageTransfer(ScribParser parser, CommonTree ct) { RoleNode src = AntlrSimpleName.toRoleNode(getSourceChild(ct)); MessageNode msg = parseMessage(parser, getMessageChild(ct)); @@ -31,7 +31,7 @@ public static GMessageTransfer parseGMessageTransfer(ScribbleParser parser, Comm return AstFactoryImpl.FACTORY.GMessageTransfer(src, msg, dests); } - protected static MessageNode parseMessage(ScribbleParser parser, CommonTree ct) + protected static MessageNode parseMessage(ScribParser parser, CommonTree ct) { AntlrNodeType type = ScribParserUtil.getAntlrNodeType(ct); if (type == AntlrNodeType.MESSAGESIGNATURE) diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGParallel.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGParallel.java index 36d52977c..8f4b10351 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGParallel.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGParallel.java @@ -6,12 +6,12 @@ import org.antlr.runtime.tree.CommonTree; import org.scribble.ast.global.GParallel; import org.scribble.ast.global.GProtocolBlock; -import org.scribble.parser.ScribbleParser; +import org.scribble.parser.ScribParser; import org.scribble.parser.util.ScribParserUtil; public class AntlrGParallel { - public static GParallel parseGParallel(ScribbleParser parser, CommonTree ct) + public static GParallel parseGParallel(ScribParser parser, CommonTree ct) { List blocks = getBlockChildren(ct).stream().map((b) -> (GProtocolBlock) parser.parse(b)).collect(Collectors.toList()); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolBlock.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolBlock.java index 7d3f5e435..8bf3da860 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolBlock.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolBlock.java @@ -4,13 +4,13 @@ import org.scribble.ast.AstFactoryImpl; import org.scribble.ast.global.GInteractionSeq; import org.scribble.ast.global.GProtocolBlock; -import org.scribble.parser.ScribbleParser; +import org.scribble.parser.ScribParser; public class AntlrGProtocolBlock { public static final int INTERACTIONSEQUENCE_CHILD_INDEX = 0; - public static GProtocolBlock parseGProtocolBlock(ScribbleParser parser, CommonTree ct) + public static GProtocolBlock parseGProtocolBlock(ScribParser parser, CommonTree ct) { GInteractionSeq gis = (GInteractionSeq) parser.parse(getInteractionSequenceChild(ct)); return AstFactoryImpl.FACTORY.GProtocolBlock(gis); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDecl.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDecl.java index c6762310a..6d7d0397c 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDecl.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDecl.java @@ -5,14 +5,14 @@ import org.scribble.ast.global.GProtocolDecl; import org.scribble.ast.global.GProtocolDef; import org.scribble.ast.global.GProtocolHeader; -import org.scribble.parser.ScribbleParser; +import org.scribble.parser.ScribParser; public class AntlrGProtocolDecl { public static final int HEADER_CHILD_INDEX = 0; public static final int BODY_CHILD_INDEX = 1; - public static GProtocolDecl parseGPrototocolDecl(ScribbleParser parser, CommonTree ct) + public static GProtocolDecl parseGPrototocolDecl(ScribParser parser, CommonTree ct) { GProtocolHeader header = (GProtocolHeader) parser.parse(getHeaderChild(ct)); GProtocolDef def = (GProtocolDef) parser.parse(getBodyChild(ct)); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDefinition.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDefinition.java index 800372aa3..678921e6b 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDefinition.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolDefinition.java @@ -4,13 +4,13 @@ import org.scribble.ast.AstFactoryImpl; import org.scribble.ast.global.GProtocolBlock; import org.scribble.ast.global.GProtocolDef; -import org.scribble.parser.ScribbleParser; +import org.scribble.parser.ScribParser; public class AntlrGProtocolDefinition { public static final int BLOCK_CHILD_INDEX = 0; - public static GProtocolDef parseGProtocolDefinition(ScribbleParser parser, CommonTree ct) + public static GProtocolDef parseGProtocolDefinition(ScribParser parser, CommonTree ct) { GProtocolBlock gpb = (GProtocolBlock) parser.parse(getBlockChild(ct)); return AstFactoryImpl.FACTORY.GProtocolDef(gpb); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolHeader.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolHeader.java index 14971dddb..6695c90c6 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolHeader.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGProtocolHeader.java @@ -6,7 +6,7 @@ import org.scribble.ast.RoleDeclList; import org.scribble.ast.global.GProtocolHeader; import org.scribble.ast.name.qualified.GProtocolNameNode; -import org.scribble.parser.ScribbleParser; +import org.scribble.parser.ScribParser; import org.scribble.parser.ast.name.AntlrSimpleName; public class AntlrGProtocolHeader @@ -15,7 +15,7 @@ public class AntlrGProtocolHeader public static final int PARAMETERDECLLIST_CHILD_INDEX = 1; public static final int ROLEDECLLIST_CHILD_INDEX = 2; - public static GProtocolHeader parseGProtocolHeader(ScribbleParser parser, CommonTree ct) + public static GProtocolHeader parseGProtocolHeader(ScribParser parser, CommonTree ct) { GProtocolNameNode name = AntlrSimpleName.toGProtocolNameNode(getNameChild(ct)); RoleDeclList rdl = (RoleDeclList) parser.parse(getRoleDeclListChild(ct)); diff --git a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGRecursion.java b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGRecursion.java index 7be18f818..90af90514 100755 --- a/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGRecursion.java +++ b/modules/parser/src/main/java/org/scribble/parser/ast/global/AntlrGRecursion.java @@ -5,7 +5,7 @@ import org.scribble.ast.global.GProtocolBlock; import org.scribble.ast.global.GRecursion; 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 AntlrGRecursion @@ -13,7 +13,7 @@ public class AntlrGRecursion public static final int RECURSIONVAR_CHILD_INDEX = 0; public static final int BLOCK_CHILD_INDEX = 1; - public static GRecursion parseGRecursion(ScribbleParser parser, CommonTree ct) + public static GRecursion parseGRecursion(ScribParser parser, CommonTree ct) { RecVarNode recvar = AntlrSimpleName.toRecVarNode(getRecVarChild(ct)); GProtocolBlock block = (GProtocolBlock) parser.parse(getBlockChild(ct));