[Swift-commit] cog r3806
swift at ci.uchicago.edu
swift at ci.uchicago.edu
Fri Oct 4 17:45:04 CDT 2013
------------------------------------------------------------------------
r3806 | hategan | 2013-10-04 17:44:58 -0500 (Fri, 04 Oct 2013) | 1 line
don't allow positional arguments to be passed as keyword arguments and detect this at compile-time
------------------------------------------------------------------------
Index: modules/karajan/src/org/globus/cog/karajan/analyzer/Scope.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/analyzer/Scope.java (revision 3805)
+++ modules/karajan/src/org/globus/cog/karajan/analyzer/Scope.java (working copy)
@@ -536,7 +536,7 @@
addVar(v, index++);
}
for (Param o : optional) {
- Var v = new ParamWrapperVar.Positional(o);
+ Var v = new ParamWrapperVar.UDFOptional(o);
addVar(v, index++);
}
return first;
Index: modules/karajan/src/org/globus/cog/karajan/analyzer/ParamWrapperVar.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/analyzer/ParamWrapperVar.java (revision 3805)
+++ modules/karajan/src/org/globus/cog/karajan/analyzer/ParamWrapperVar.java (working copy)
@@ -44,8 +44,24 @@
super.setIndex(index);
param.setIndex(index);
}
+
+ @Override
+ public boolean isSettableByName() {
+ return false;
+ }
}
+ public static class UDFOptional extends Positional {
+ public UDFOptional(Param p) {
+ super(p);
+ }
+
+ @Override
+ public boolean isSettableByName() {
+ return true;
+ }
+ }
+
public static class Optional extends ParamWrapperVar {
private IndexRange ir;
Index: modules/karajan/src/org/globus/cog/karajan/analyzer/Var.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/analyzer/Var.java (revision 3805)
+++ modules/karajan/src/org/globus/cog/karajan/analyzer/Var.java (working copy)
@@ -59,6 +59,10 @@
this.canBeNull = canBeNull;
}
+ public boolean isSettableByName() {
+ return true;
+ }
+
@Override
public String toString() {
if (getValue() == null) {
Index: modules/karajan/src/org/globus/cog/karajan/compiled/nodes/InternalFunction.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/compiled/nodes/InternalFunction.java (revision 3805)
+++ modules/karajan/src/org/globus/cog/karajan/compiled/nodes/InternalFunction.java (working copy)
@@ -20,7 +20,6 @@
import k.rt.ExecutionException;
import k.rt.FutureObject;
import k.rt.FutureValue;
-import k.rt.IllegalExtraArgumentException;
import k.rt.Stack;
import k.thr.LWThread;
import k.thr.Yield;
@@ -29,7 +28,6 @@
import org.globus.cog.karajan.analyzer.ArgRef;
import org.globus.cog.karajan.analyzer.ChannelRef;
import org.globus.cog.karajan.analyzer.CompilationException;
-import org.globus.cog.karajan.analyzer.CompilerSettings;
import org.globus.cog.karajan.analyzer.IntrospectionHelper;
import org.globus.cog.karajan.analyzer.Param;
import org.globus.cog.karajan.analyzer.ParamWrapperVar;
Index: modules/karajan/src/org/globus/cog/karajan/compiled/nodes/functions/Named.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/compiled/nodes/functions/Named.java (revision 3805)
+++ modules/karajan/src/org/globus/cog/karajan/compiled/nodes/functions/Named.java (working copy)
@@ -39,7 +39,9 @@
@Override
public Node compileBody(WrapperNode w, Scope argScope, Scope scope) throws CompilationException {
Var vret = scope.parent.lookupParam(name, this);
-
+ if (!vret.isSettableByName()) {
+ throw new CompilationException(this, "Cannot pass positional argument '" + name + "' by name");
+ }
if (value.isStatic()) {
vret.setValue(value.getValue());
@@ -63,4 +65,15 @@
ret.setValue(stack, value.getValue(stack));
}
}
+
+ @Override
+ public String getTextualName() {
+ if (name == null) {
+ return super.getTextualName();
+ }
+ else {
+ return name + "=";
+ }
+ }
+
}
\ No newline at end of file
Index: modules/karajan/src/org/globus/cog/karajan/compiled/nodes/user/UserDefinedFunction.java
===================================================================
--- modules/karajan/src/org/globus/cog/karajan/compiled/nodes/user/UserDefinedFunction.java (revision 3805)
+++ modules/karajan/src/org/globus/cog/karajan/compiled/nodes/user/UserDefinedFunction.java (working copy)
@@ -106,7 +106,7 @@
@Override
public Node compileChildren(WrapperNode w, Scope scope) throws CompilationException {
List<Param> params = getParams(w, scope);
-
+
compileOptionalParamValues(params, scope);
sig = new Signature(params);
Index: modules/karajan/resources/sys.k
===================================================================
--- modules/karajan/resources/sys.k (revision 3805)
+++ modules/karajan/resources/sys.k (working copy)
@@ -1,153 +1,153 @@
namespace(sys) {
export(parallel, def("org.globus.cog.karajan.compiled.nodes.Parallel"))
- export(uparallel, def(classname="org.globus.cog.karajan.compiled.nodes.UParallel"))
- export(unsynchronized, def(classname="org.globus.cog.karajan.compiled.nodes.UnsynchronizedNode"))
- export(race, def(classname="org.globus.cog.karajan.compiled.nodes.Race"))
- export(try, def(classname="org.globus.cog.karajan.compiled.nodes.Try"))
- export(catch, def(classname="org.globus.cog.karajan.compiled.nodes.Catch"))
- export(maybe, def(classname="org.globus.cog.karajan.compiled.nodes.Maybe"))
- export(exclusive, def(classname="org.globus.cog.karajan.compiled.nodes.Exclusive"))
- export(cache, def(classname="org.globus.cog.karajan.compiled.nodes.CacheNode"))
+ export(uparallel, def("org.globus.cog.karajan.compiled.nodes.UParallel"))
+ export(unsynchronized, def("org.globus.cog.karajan.compiled.nodes.UnsynchronizedNode"))
+ export(race, def("org.globus.cog.karajan.compiled.nodes.Race"))
+ export(try, def("org.globus.cog.karajan.compiled.nodes.Try"))
+ export(catch, def("org.globus.cog.karajan.compiled.nodes.Catch"))
+ export(maybe, def("org.globus.cog.karajan.compiled.nodes.Maybe"))
+ export(exclusive, def("org.globus.cog.karajan.compiled.nodes.Exclusive"))
+ export(cache, def("org.globus.cog.karajan.compiled.nodes.CacheNode"))
- export(future, def(classname="org.globus.cog.karajan.compiled.nodes.FutureNode"))
- export(futureChannel, def(classname="org.globus.cog.karajan.compiled.nodes.FutureChannelNode"))
+ export(future, def("org.globus.cog.karajan.compiled.nodes.FutureNode"))
+ export(futureChannel, def("org.globus.cog.karajan.compiled.nodes.FutureChannelNode"))
- export(echo, def(classname="org.globus.cog.karajan.compiled.nodes.Echo"))
- export(print, def(classname="org.globus.cog.karajan.compiled.nodes.Print"))
+ export(echo, def("org.globus.cog.karajan.compiled.nodes.Echo"))
+ export(print, def("org.globus.cog.karajan.compiled.nodes.Print"))
- export(for, def(classname="org.globus.cog.karajan.compiled.nodes.For"))
- export(parallelFor, def(classname="org.globus.cog.karajan.compiled.nodes.ParallelFor"))
- export(uParallelFor, def(classname="org.globus.cog.karajan.compiled.nodes.UParallelFor"))
- export(each, def(classname="org.globus.cog.karajan.compiled.nodes.Each"))
+ export(for, def("org.globus.cog.karajan.compiled.nodes.For"))
+ export(parallelFor, def("org.globus.cog.karajan.compiled.nodes.ParallelFor"))
+ export(uParallelFor, def("org.globus.cog.karajan.compiled.nodes.UParallelFor"))
+ export(each, def("org.globus.cog.karajan.compiled.nodes.Each"))
- export(restartOnError, def(classname="org.globus.cog.karajan.compiled.nodes.RestartOnErrorNode"))
- export(throw, def(classname="org.globus.cog.karajan.compiled.nodes.Throw"))
- export(exception, def(classname="org.globus.cog.karajan.compiled.nodes.functions.KException"))
+ export(restartOnError, def("org.globus.cog.karajan.compiled.nodes.RestartOnErrorNode"))
+ export(throw, def("org.globus.cog.karajan.compiled.nodes.Throw"))
+ export(exception, def("org.globus.cog.karajan.compiled.nodes.functions.KException"))
namespace(channel) {
- export(new, def(classname="org.globus.cog.karajan.compiled.nodes.ChannelNew"))
- export(from, def(classname="org.globus.cog.karajan.compiled.nodes.ChannelFrom"))
- export(to, def(classname="org.globus.cog.karajan.compiled.nodes.ChannelTo"))
- export(fork, def(classname="org.globus.cog.karajan.compiled.nodes.ChannelFork"))
- export(close, def(classname="org.globus.cog.karajan.compiled.nodes.ChannelClose"))
+ export(new, def("org.globus.cog.karajan.compiled.nodes.ChannelNew"))
+ export(from, def("org.globus.cog.karajan.compiled.nodes.ChannelFrom"))
+ export(to, def("org.globus.cog.karajan.compiled.nodes.ChannelTo"))
+ export(fork, def("org.globus.cog.karajan.compiled.nodes.ChannelFork"))
+ export(close, def("org.globus.cog.karajan.compiled.nodes.ChannelClose"))
}
- export(formatNumber, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$FormatNumber"))
- export(formatDate, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$FormatDate"))
- export(contains, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$FileContains"))
- export(file:contains, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$FileContains"))
- export(UID, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$UID"))
- export(readFile, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$FileRead"))
- export(file:read, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$FileRead"))
- export(property, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Property"))
- export(getenv, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$GetEnv"))
- export(outputStream, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$OutputStream"))
- export(closeStream, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$CloseStream"))
+ export(formatNumber, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$FormatNumber"))
+ export(formatDate, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$FormatDate"))
+ export(contains, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$FileContains"))
+ export(file:contains, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$FileContains"))
+ export(UID, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$UID"))
+ export(readFile, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$FileRead"))
+ export(file:read, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$FileRead"))
+ export(property, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Property"))
+ export(getenv, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$GetEnv"))
+ export(outputStream, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$OutputStream"))
+ export(closeStream, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$CloseStream"))
export(contextAttribute, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$ContextAttribute"))
- export(discard, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Discard"))
- export(range, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Range"))
- export(filter, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Filter"))
- export(sort, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Sort"))
+ export(discard, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Discard"))
+ export(range, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Range"))
+ export(filter, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Filter"))
+ export(sort, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Sort"))
- export(dot, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Dot"))
- export(cross, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Cross"))
- export(unique, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Unique"))
+ export(dot, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Dot"))
+ export(cross, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Cross"))
+ export(unique, def("org.globus.cog.karajan.compiled.nodes.functions.Unique"))
namespace(str) {
- export(strip, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Strip"))
- export(split, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Split"))
- export(matches, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Matches"))
- export(chr, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Chr"))
- export(substring, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$SubString"))
- export(quote, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Quote"))
+ export(strip, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Strip"))
+ export(split, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Split"))
+ export(matches, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Matches"))
+ export(chr, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Chr"))
+ export(substring, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$SubString"))
+ export(quote, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Quote"))
export(number, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$ParseNumber"))
}
- export(time, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Time"))
- export(once, def(classname="org.globus.cog.karajan.compiled.nodes.Once"))
+ export(time, def("org.globus.cog.karajan.compiled.nodes.functions.Time"))
+ export(once, def("org.globus.cog.karajan.compiled.nodes.Once"))
- export(wait, def(classname="org.globus.cog.karajan.compiled.nodes.WaitNode"))
- export(executeFile, def(classname="org.globus.cog.karajan.compiled.nodes.ExecuteFile"))
- export(file:execute, def(classname="org.globus.cog.karajan.compiled.nodes.ExecuteFile"))
- export(file:write, def(classname="org.globus.cog.karajan.compiled.nodes.FileWrite"))
+ export(wait, def("org.globus.cog.karajan.compiled.nodes.WaitNode"))
+ export(executeFile, def("org.globus.cog.karajan.compiled.nodes.ExecuteFile"))
+ export(file:execute, def("org.globus.cog.karajan.compiled.nodes.ExecuteFile"))
+ export(file:write, def("org.globus.cog.karajan.compiled.nodes.FileWrite"))
- export(CBFFunction, def(classname="org.globus.cog.karajan.compiled.nodes.user.CBFFunction"))
- export(apply, def(classname="org.globus.cog.karajan.compiled.nodes.Apply"))
+ export(CBFFunction, def("org.globus.cog.karajan.compiled.nodes.user.CBFFunction"))
+ export(apply, def("org.globus.cog.karajan.compiled.nodes.Apply"))
- export(if, def(classname="org.globus.cog.karajan.compiled.nodes.If"))
- export(while, def(classname="org.globus.cog.karajan.compiled.nodes.While"))
- export(next, def(classname="org.globus.cog.karajan.compiled.nodes.Next"))
+ export(if, def("org.globus.cog.karajan.compiled.nodes.If"))
+ export(while, def("org.globus.cog.karajan.compiled.nodes.While"))
+ export(next, def("org.globus.cog.karajan.compiled.nodes.Next"))
namespace(math) {
- export(sum, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Sum"))
- export(sqrt, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Sqrt"))
- export(equalsNumeric, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$EqualsNumeric"))
- export(min, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Min"))
- export(max, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Max"))
- export(floor, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Floor"))
- export(round, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Round"))
- export(ln, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Ln"))
- export(exp, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Exp"))
- export(random, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Random"))
- export(sin, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Sin"))
- export(cos, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Cos"))
- export(tan, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Tan"))
- export(asin, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$ASin"))
- export(acos, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$ACos"))
- export(atan, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$ATan"))
- export(sinh, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Sinh"))
- export(cosh, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Cosh"))
- export(tanh, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Tanh"))
- export(pow, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Pow"))
+ export(sum, def("org.globus.cog.karajan.compiled.nodes.functions.Sum"))
+ export(sqrt, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Sqrt"))
+ export(equalsNumeric, def("org.globus.cog.karajan.compiled.nodes.functions.Math$EqualsNumeric"))
+ export(min, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Min"))
+ export(max, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Max"))
+ export(floor, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Floor"))
+ export(round, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Round"))
+ export(ln, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Ln"))
+ export(exp, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Exp"))
+ export(random, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Random"))
+ export(sin, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Sin"))
+ export(cos, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Cos"))
+ export(tan, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Tan"))
+ export(asin, def("org.globus.cog.karajan.compiled.nodes.functions.Math$ASin"))
+ export(acos, def("org.globus.cog.karajan.compiled.nodes.functions.Math$ACos"))
+ export(atan, def("org.globus.cog.karajan.compiled.nodes.functions.Math$ATan"))
+ export(sinh, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Sinh"))
+ export(cosh, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Cosh"))
+ export(tanh, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Tanh"))
+ export(pow, def("org.globus.cog.karajan.compiled.nodes.functions.Math$Pow"))
}
- export(equals, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Equals"))
+ export(equals, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Equals"))
namespace(list) {
- export(append, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$Append"))
- export(list, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$Cons"))
- export(prepend, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$Prepend"))
- export(join, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$Join"))
- export(size, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$Size"))
- export(last, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$Last"))
- export(first, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$First"))
- export(butLast, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$ButLast"))
- export(butFirst, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$ButFirst"))
- export(isEmpty, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$IsEmpty"))
- export(get, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$Get"))
- export(isList, def(classname="org.globus.cog.karajan.compiled.nodes.functions.List$IsList"))
+ export(append, def("org.globus.cog.karajan.compiled.nodes.functions.List$Append"))
+ export(list, def("org.globus.cog.karajan.compiled.nodes.functions.List$Cons"))
+ export(prepend, def("org.globus.cog.karajan.compiled.nodes.functions.List$Prepend"))
+ export(join, def("org.globus.cog.karajan.compiled.nodes.functions.List$Join"))
+ export(size, def("org.globus.cog.karajan.compiled.nodes.functions.List$Size"))
+ export(last, def("org.globus.cog.karajan.compiled.nodes.functions.List$Last"))
+ export(first, def("org.globus.cog.karajan.compiled.nodes.functions.List$First"))
+ export(butLast, def("org.globus.cog.karajan.compiled.nodes.functions.List$ButLast"))
+ export(butFirst, def("org.globus.cog.karajan.compiled.nodes.functions.List$ButFirst"))
+ export(isEmpty, def("org.globus.cog.karajan.compiled.nodes.functions.List$IsEmpty"))
+ export(get, def("org.globus.cog.karajan.compiled.nodes.functions.List$Get"))
+ export(isList, def("org.globus.cog.karajan.compiled.nodes.functions.List$IsList"))
}
namespace(map) {
- export(map, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Map$Cons"))
- export(put, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Map$Put"))
- export(delete, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Map$Delete"))
- export(get, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Map$Get"))
- export(entry, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Map$EntryCons"))
- export(size, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Map$Size"))
- export(contains, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Map$Contains"))
+ export(map, def("org.globus.cog.karajan.compiled.nodes.functions.Map$Cons"))
+ export(put, def("org.globus.cog.karajan.compiled.nodes.functions.Map$Put"))
+ export(delete, def("org.globus.cog.karajan.compiled.nodes.functions.Map$Delete"))
+ export(get, def("org.globus.cog.karajan.compiled.nodes.functions.Map$Get"))
+ export(entry, def("org.globus.cog.karajan.compiled.nodes.functions.Map$EntryCons"))
+ export(size, def("org.globus.cog.karajan.compiled.nodes.functions.Map$Size"))
+ export(contains, def("org.globus.cog.karajan.compiled.nodes.functions.Map$Contains"))
}
- export(stats, def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Stats"))
+ export(stats, def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Stats"))
- export('&', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Logic$And"))
- export('|', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Logic$Or"))
- export('!', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Logic$Not"))
+ export('&', def("org.globus.cog.karajan.compiled.nodes.functions.Logic$And"))
+ export('|', def("org.globus.cog.karajan.compiled.nodes.functions.Logic$Or"))
+ export('!', def("org.globus.cog.karajan.compiled.nodes.functions.Logic$Not"))
namespace(math) {
- export('+', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Sum"))
- export('*', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Product"))
- export('-', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Difference"))
- export('neg', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Neg"))
- export('/', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Quotient"))
- export('%', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$Remainder"))
- export('>', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$GreaterThan"))
- export('<', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$LessThan"))
- export('>=', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$GreaterOrEqual"))
- export('<=', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Math$LessOrEqual"))
+ export('+', def("org.globus.cog.karajan.compiled.nodes.functions.Math$Sum"))
+ export('*', def("org.globus.cog.karajan.compiled.nodes.functions.Math$Product"))
+ export('-', def("org.globus.cog.karajan.compiled.nodes.functions.Math$Difference"))
+ export('neg', def("org.globus.cog.karajan.compiled.nodes.functions.Math$Neg"))
+ export('/', def("org.globus.cog.karajan.compiled.nodes.functions.Math$Quotient"))
+ export('%', def("org.globus.cog.karajan.compiled.nodes.functions.Math$Remainder"))
+ export('>', def("org.globus.cog.karajan.compiled.nodes.functions.Math$GreaterThan"))
+ export('<', def("org.globus.cog.karajan.compiled.nodes.functions.Math$LessThan"))
+ export('>=', def("org.globus.cog.karajan.compiled.nodes.functions.Math$GreaterOrEqual"))
+ export('<=', def("org.globus.cog.karajan.compiled.nodes.functions.Math$LessOrEqual"))
}
- export('==', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$Equals"))
- export('!=', def(classname="org.globus.cog.karajan.compiled.nodes.functions.Misc$NotEquals"))
+ export('==', def("org.globus.cog.karajan.compiled.nodes.functions.Misc$Equals"))
+ export('!=', def("org.globus.cog.karajan.compiled.nodes.functions.Misc$NotEquals"))
}
\ No newline at end of file
More information about the Swift-commit
mailing list