Skip to content

Commit e126c4e

Browse files
rhu1rhu1
committed
Continued.
1 parent 5cd1740 commit e126c4e

216 files changed

Lines changed: 1073 additions & 1398 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎scribble-ast/src/main/java/org/scribble/ast/Choice.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import org.antlr.runtime.Token;
2121
import org.antlr.runtime.tree.CommonTree;
2222
import org.scribble.ast.name.simple.RoleNode;
23-
import org.scribble.core.job.ScribbleException;
2423
import org.scribble.core.type.kind.ProtocolKind;
2524
import org.scribble.del.ScribDel;
2625
import org.scribble.util.Constants;
26+
import org.scribble.util.ScribException;
2727
import org.scribble.visit.AstVisitor;
2828

2929
public abstract class Choice<K extends ProtocolKind> extends CompoundInteraction<K>
@@ -65,7 +65,7 @@ public Choice<K> reconstruct(RoleNode subj, List<? extends ProtocolBlock<K>> blo
6565
}
6666

6767
@Override
68-
public Choice<K> visitChildren(AstVisitor nv) throws ScribbleException
68+
public Choice<K> visitChildren(AstVisitor nv) throws ScribException
6969
{
7070
RoleNode subj = (RoleNode) visitChild(getSubjectChild(), nv);
7171
List<? extends ProtocolBlock<K>> blocks =

‎scribble-ast/src/main/java/org/scribble/ast/Continue.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
import org.antlr.runtime.Token;
1717
import org.antlr.runtime.tree.CommonTree;
1818
import org.scribble.ast.name.simple.RecVarNode;
19-
import org.scribble.core.job.ScribbleException;
2019
import org.scribble.core.type.kind.ProtocolKind;
2120
import org.scribble.del.ScribDel;
2221
import org.scribble.util.Constants;
22+
import org.scribble.util.ScribException;
2323
import org.scribble.visit.AstVisitor;
2424

2525
public abstract class Continue<K extends ProtocolKind>
@@ -56,7 +56,7 @@ public Continue<K> reconstruct(RecVarNode recvar)
5656
}
5757

5858
@Override
59-
public Continue<K> visitChildren(AstVisitor nv) throws ScribbleException
59+
public Continue<K> visitChildren(AstVisitor nv) throws ScribException
6060
{
6161
RecVarNode recvar = (RecVarNode) visitChild(getRecVarChild(), nv);
6262
return reconstruct(recvar);

‎scribble-ast/src/main/java/org/scribble/ast/DirectedInteraction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import org.antlr.runtime.Token;
2121
import org.antlr.runtime.tree.CommonTree;
2222
import org.scribble.ast.name.simple.RoleNode;
23-
import org.scribble.core.job.ScribbleException;
2423
import org.scribble.core.type.kind.ProtocolKind;
2524
import org.scribble.core.type.name.Role;
2625
import org.scribble.del.ScribDel;
26+
import org.scribble.util.ScribException;
2727
import org.scribble.visit.AstVisitor;
2828

2929
// FIXME: rename (Simple)Interaction, after existing SimpleInteraction renamed
@@ -90,7 +90,7 @@ public DirectedInteraction<K> reconstruct(MessageNode msg, RoleNode src,
9090

9191
@Override
9292
public DirectedInteraction<K> visitChildren(AstVisitor nv)
93-
throws ScribbleException
93+
throws ScribException
9494
{
9595
MessageNode msg = (MessageNode) visitChild(getMessageNodeChild(), nv);
9696
RoleNode src = (RoleNode) visitChild(getSourceChild(), nv);

‎scribble-ast/src/main/java/org/scribble/ast/DisconnectAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
import org.antlr.runtime.Token;
1717
import org.antlr.runtime.tree.CommonTree;
1818
import org.scribble.ast.name.simple.RoleNode;
19-
import org.scribble.core.job.ScribbleException;
2019
import org.scribble.core.type.kind.ProtocolKind;
2120
import org.scribble.del.ScribDel;
21+
import org.scribble.util.ScribException;
2222
import org.scribble.visit.AstVisitor;
2323

2424
// (G)Disconnect is symmetric (send/receive asymmetric/async; request/accept asymmetric/sync; (g)disconnect symmetric/async)
@@ -66,7 +66,7 @@ public DisconnectAction<K> reconstruct(RoleNode left, RoleNode right)
6666

6767
@Override
6868
public DisconnectAction<K> visitChildren(AstVisitor nv)
69-
throws ScribbleException
69+
throws ScribException
7070
{
7171
RoleNode src = (RoleNode) visitChild(getLeftChild(), nv);
7272
RoleNode dest = (RoleNode) visitChild(getRightChild(), nv);

‎scribble-ast/src/main/java/org/scribble/ast/Do.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
import org.antlr.runtime.Token;
1919
import org.antlr.runtime.tree.CommonTree;
2020
import org.scribble.ast.name.qualified.ProtocolNameNode;
21-
import org.scribble.core.job.ScribbleException;
2221
import org.scribble.core.lang.context.ModuleContext;
2322
import org.scribble.core.type.kind.ProtocolKind;
2423
import org.scribble.core.type.name.ProtocolName;
2524
import org.scribble.core.type.name.Role;
2625
import org.scribble.del.ScribDel;
2726
import org.scribble.lang.LangContext;
2827
import org.scribble.util.Constants;
28+
import org.scribble.util.ScribException;
2929
import org.scribble.visit.AstVisitor;
3030

3131
public abstract class Do<K extends ProtocolKind>
@@ -77,7 +77,7 @@ public Do<K> reconstruct(RoleArgList roles, NonRoleArgList args, ProtocolNameNod
7777
}
7878

7979
@Override
80-
public Do<K> visitChildren(AstVisitor nv) throws ScribbleException
80+
public Do<K> visitChildren(AstVisitor nv) throws ScribException
8181
{
8282
RoleArgList ril = (RoleArgList) visitChild(getRoleListChild(), nv);
8383
NonRoleArgList al = (NonRoleArgList) visitChild(getNonRoleListChild(), nv);

‎scribble-ast/src/main/java/org/scribble/ast/DoArg.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import org.antlr.runtime.Token;
1717
import org.antlr.runtime.tree.CommonTree;
18-
import org.scribble.core.job.ScribbleException;
1918
import org.scribble.core.type.name.Role;
2019
import org.scribble.del.ScribDel;
20+
import org.scribble.util.ScribException;
2121
import org.scribble.visit.AstVisitor;
2222

2323
// TODO: rename better? DoArg, DoArgNode, ...
@@ -54,7 +54,7 @@ public DoArg<T> reconstruct(T arg)
5454
}
5555

5656
@Override
57-
public DoArg<T> visitChildren(AstVisitor nv) throws ScribbleException
57+
public DoArg<T> visitChildren(AstVisitor nv) throws ScribException
5858
{
5959
ScribNode visited = visitChild(getValChild(), nv); // Disambiguation will replace AmbiguousNameNodes
6060
// CHECKME: use visitChildWithClassEqualityCheck?

‎scribble-ast/src/main/java/org/scribble/ast/DoArgList.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
import org.antlr.runtime.Token;
2121
import org.antlr.runtime.tree.CommonTree;
22-
import org.scribble.core.job.ScribbleException;
2322
import org.scribble.core.type.name.Role;
2423
import org.scribble.del.ScribDel;
24+
import org.scribble.util.ScribException;
2525
import org.scribble.visit.AstVisitor;
2626

2727
// Cf. HeaderParameterDeclList -- but not kinded, because cannot determine Arg kind directly from node syntax itself (kinding for ModelNodes is to supplement syntactic information, not "typing" work)
@@ -65,7 +65,7 @@ public DoArgList<T> reconstruct(List<T> args)
6565
public abstract DoArgList<T> project(AstFactory af, Role self);
6666

6767
@Override
68-
public DoArgList<T> visitChildren(AstVisitor nv) throws ScribbleException
68+
public DoArgList<T> visitChildren(AstVisitor nv) throws ScribException
6969
{
7070
List<T> nds =
7171
visitChildListWithClassEqualityCheck(this, getArgChildren(), nv);

‎scribble-ast/src/main/java/org/scribble/ast/HeaderParamDecl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import org.antlr.runtime.tree.CommonTree;
1818
import org.scribble.ast.name.NameNode;
1919
import org.scribble.ast.name.simple.SimpleNameNode;
20-
import org.scribble.core.job.ScribbleException;
2120
import org.scribble.core.type.kind.ParamKind;
2221
import org.scribble.core.type.name.Role;
2322
import org.scribble.del.ScribDel;
23+
import org.scribble.util.ScribException;
2424
import org.scribble.visit.AstVisitor;
2525

2626
// Names that are declared in a protocol header (roles and parameters -- not the protocol name though)
@@ -56,7 +56,7 @@ public HeaderParamDecl<K> reconstruct(NameNode<K> name) // Always a "simple" na
5656

5757
@Override
5858
public HeaderParamDecl<K> visitChildren(AstVisitor nv)
59-
throws ScribbleException
59+
throws ScribException
6060
{
6161
NameNode<K> name =
6262
visitChildWithClassEqualityCheck(this, getNameNodeChild(), nv);

‎scribble-ast/src/main/java/org/scribble/ast/HeaderParamDeclList.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
import org.antlr.runtime.Token;
2121
import org.antlr.runtime.tree.CommonTree;
22-
import org.scribble.core.job.ScribbleException;
2322
import org.scribble.core.type.kind.ParamKind;
2423
import org.scribble.core.type.name.Role;
2524
import org.scribble.del.ScribDel;
25+
import org.scribble.util.ScribException;
2626
import org.scribble.visit.AstVisitor;
2727

2828

@@ -60,7 +60,7 @@ public HeaderParamDeclList<K> reconstruct(
6060

6161
@Override
6262
public HeaderParamDeclList<? extends K> visitChildren(AstVisitor nv)
63-
throws ScribbleException
63+
throws ScribException
6464
{
6565
List<? extends HeaderParamDecl<K>> nds =
6666
visitChildListWithClassEqualityCheck(this, getParamDeclChildren(), nv);

‎scribble-ast/src/main/java/org/scribble/ast/ImportModule.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import org.antlr.runtime.Token;
1717
import org.antlr.runtime.tree.CommonTree;
1818
import org.scribble.ast.name.qualified.ModuleNameNode;
19-
import org.scribble.core.job.ScribbleException;
2019
import org.scribble.core.type.kind.ModuleKind;
2120
import org.scribble.core.type.name.ModuleName;
2221
import org.scribble.del.ScribDel;
2322
import org.scribble.util.Constants;
23+
import org.scribble.util.ScribException;
2424
import org.scribble.visit.AstVisitor;
2525

2626
public class ImportModule extends ImportDecl<ModuleKind>
@@ -41,12 +41,15 @@ protected ImportModule(ImportModule node)
4141
this.alias = null;
4242
}
4343

44+
// Full name ("import x.y.Z")
4445
public ModuleNameNode getModuleNameNodeChild()
4546
{
4647
return (ModuleNameNode) getChild(0);
4748
}
4849

49-
// No child if no alias (cf., this.hasAlias)
50+
// Pre: hasAlias
51+
// Simple name
52+
// No child (null) if no alias
5053
public ModuleNameNode getAliasNameNodeChild()
5154
{
5255
return (ModuleNameNode) getChild(1);
@@ -74,7 +77,7 @@ public ImportModule reconstruct(ModuleNameNode modname, ModuleNameNode alias)
7477
}
7578

7679
@Override
77-
public ImportModule visitChildren(AstVisitor nv) throws ScribbleException
80+
public ImportModule visitChildren(AstVisitor nv) throws ScribException
7881
{
7982
ModuleNameNode modname = (ModuleNameNode)
8083
visitChild(getModuleNameNodeChild(), nv);

0 commit comments

Comments
 (0)