Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
6 .project
@@ -6,12 +6,18 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.ebayopensource.vjet.eclipse.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.ebayopensource.vjet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
View
2  src/bin/ceylonjs
@@ -21,8 +21,6 @@ JAVA_CP="$JAVA_CP:$CEYLON_REPO/com/redhat/ceylon/typechecker/$CEYLON_VERSION/com
JAVA_CP="$JAVA_CP:$CEYLON_REPO/com/redhat/ceylon/module-resolver/$CEYLON_VERSION/com.redhat.ceylon.module-resolver-$CEYLON_VERSION.jar"
JAVA_CP="$JAVA_CP:$CEYLON_HOME/../../ceylon-compiler/lib/antlr-3.4-complete.jar"
-echo classpath es $JAVA_CP
-
java \
-enableassertions \
-Xbootclasspath/p:"$JAVA_CP:$(dirname "$PRG")/../lib/jscompiler-${CEYLON_VERSION}.jar" \
View
15 src/main/java/com/redhat/ceylon/compiler/js/GenerateJsVisitor.java
@@ -1312,16 +1312,15 @@ public void visit(InvocationExpression that) {
that.getNamedArgumentList().visit(this);
out("return ");
that.getPrimary().visit(this);
- out("(");
if (that.getPrimary() instanceof Tree.MemberOrTypeExpression) {
Tree.MemberOrTypeExpression mte = (Tree.MemberOrTypeExpression) that.getPrimary();
if (mte.getDeclaration() instanceof Functional) {
Functional f = (Functional) mte.getDeclaration();
- if (!f.getParameterLists().isEmpty()) {
+ for (com.redhat.ceylon.compiler.typechecker.model.ParameterList plist : f.getParameterLists()) {
List<String> argNames = that.getNamedArgumentList().getNamedArgumentList().getArgumentNames();
boolean first=true;
- for (com.redhat.ceylon.compiler.typechecker.model.Parameter p:
- f.getParameterLists().get(0).getParameters()) {
+ out("(");
+ for (com.redhat.ceylon.compiler.typechecker.model.Parameter p : plist.getParameters()) {
if (!first) out(",");
if (p.isSequenced() && that.getNamedArgumentList().getSequencedArgument()==null && that.getNamedArgumentList().getNamedArguments().isEmpty()) {
out(clAlias, ".empty");
@@ -1332,10 +1331,11 @@ public void visit(InvocationExpression that) {
}
first = false;
}
+ out(")");
}
}
}
- out(")}())");
+ out("}())");
}
else {
super.visit(that);
@@ -2335,7 +2335,10 @@ public void generate(BinaryOpTermGenerator termgen) {
}
@Override public void visit(ForStatement that) {
- if (comment) out("//'for' statement at ", that.getUnit().getFilename(), " (", that.getLocation(), ")");
+ if (comment) {
+ out("//'for' statement at ", that.getUnit().getFilename(), " (", that.getLocation(), ")");
+ if (that.getExits()) out("//EXITS!");
+ }
endLine();
ForIterator foriter = that.getForClause().getForIterator();
SpecifierExpression iterable = foriter.getSpecifierExpression();

No commit comments for this range

Something went wrong with that request. Please try again.