Skip to content

Allow bracketed expressions in ZenType declarations. #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eutro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow bracketed expressions in ZenType declarations. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e86a8f2
Allow bracketed expressions in ZenType declarations.
eutro Oct 23, 2020
2ba5e7b
Move bracketing in toStrings to ZenTypeFunction
eutro Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/stanhebben/zenscript/type/ZenType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ public static ZenType read(ZenTokener parser, IEnvironmentGlobal environment) {
base = new ZenTypeArrayList(read(parser, environment));
parser.required(ZenTokener.T_SQBRCLOSE, "] expected");
break;
case ZenTokener.T_BROPEN:
base = read(parser, environment);
parser.required(ZenTokener.T_BRCLOSE, ") expected");
break;
default:
throw new ParseException(next, "Unknown type: " + next.getValue());
}
Expand Down
33 changes: 12 additions & 21 deletions src/main/java/stanhebben/zenscript/type/ZenTypeFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,18 @@ public ZenTypeFunction(ZenType returnType, List<ParsedFunctionArgument> argument
for(int i = 0; i < argumentTypes.length; i++) {
argumentTypes[i] = arguments.get(i).getType();
}

StringBuilder nameBuilder = new StringBuilder();
nameBuilder.append("function(");
boolean first = true;
for(ZenType type : argumentTypes) {
if(first) {
first = false;
} else {
nameBuilder.append(',');
}
nameBuilder.append(type.getName());
}
nameBuilder.append(returnType.getName());
name = nameBuilder.toString();
name = makeName();
}

public ZenTypeFunction(ZenType returnType, ZenType[] argumentTypes) {
this.returnType = returnType;
this.argumentTypes = argumentTypes;

StringBuilder nameBuilder = new StringBuilder();
nameBuilder.append("function(");
this.name = makeName();
}

private String makeName() {
StringBuilder nameBuilder = new StringBuilder()
.append("(function(");
boolean first = true;
for(ZenType type : argumentTypes) {
if(first) {
Expand All @@ -59,9 +49,10 @@ public ZenTypeFunction(ZenType returnType, ZenType[] argumentTypes) {
}
nameBuilder.append(type.getName());
}
nameBuilder.append(')');
nameBuilder.append(returnType.getName());
name = nameBuilder.toString();
nameBuilder.append(')')
.append(returnType.getName())
.append(')');
return nameBuilder.toString();
}

@Override
Expand Down Expand Up @@ -227,4 +218,4 @@ public ZenType[] getArgumentTypes() {
public String getNameForInterfaceSignature() {
return ZenTypeFunctionCallable.makeInterfaceName(returnType, argumentTypes);
}
}
}