diff options
author | paltherr <paltherr@epfl.ch> | 2004-11-18 09:26:12 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-11-18 09:26:12 +0000 |
commit | a8731f5c35c605db1feeef4d5e9caba437d798f2 (patch) | |
tree | 7bde583120f0e38b3b717b2584567271aea8ae34 /sources | |
parent | 4bd7cf5b63b1be5da392018e95e08f704043471f (diff) | |
download | scala-a8731f5c35c605db1feeef4d5e9caba437d798f2.tar.gz scala-a8731f5c35c605db1feeef4d5e9caba437d798f2.tar.bz2 scala-a8731f5c35c605db1feeef4d5e9caba437d798f2.zip |
- Replaced Function*.java by Function*.scala
Diffstat (limited to 'sources')
-rw-r--r-- | sources/meta/scala/MetaFunction.java | 20 | ||||
-rw-r--r-- | sources/scala/.cvsignore | 2 | ||||
-rw-r--r-- | sources/scala/Function.scala.tmpl (renamed from sources/scala/Function.java.tmpl) | 6 |
3 files changed, 11 insertions, 17 deletions
diff --git a/sources/meta/scala/MetaFunction.java b/sources/meta/scala/MetaFunction.java index 269cae0943..11ed9cc159 100644 --- a/sources/meta/scala/MetaFunction.java +++ b/sources/meta/scala/MetaFunction.java @@ -10,7 +10,7 @@ package meta.scala; import meta.java.AbstractJavaExpander; -public class MetaFunction extends AbstractJavaExpander { +public class MetaFunction extends AbstractScalaExpander { //######################################################################## // Public Fields @@ -35,24 +35,20 @@ public class MetaFunction extends AbstractJavaExpander { writer.print(arity); } - public void printClassScalaTParams() { + public void printClassSignature() { + writer.print("["); for (int i = 0; i < arity; i++) - writer.print("- ?A").print(i).print(", "); - writer.print("+ ?R"); + writer.print("-T").print(i).print(", "); + writer.print("+R]"); } - public void printApplyScalaSignature() { + public void printApplySignature() { writer.print("("); - for (int i = 0; i < arity; i++) - writer.print("?A").print(i).print(", "); - writer.print(") ?R"); - } - - public void printApplyJavaVParams() { for (int i = 0; i < arity; i++) { if (i > 0) writer.print(", "); - writer.print("java.lang.Object a").print(i); + writer.print("v").print(i).print(":").space().print("T").print(i); } + writer.print("): R"); } //######################################################################## diff --git a/sources/scala/.cvsignore b/sources/scala/.cvsignore index 96afb593ca..27a42e8e92 100644 --- a/sources/scala/.cvsignore +++ b/sources/scala/.cvsignore @@ -1,2 +1,2 @@ -Function*.java +Function*.scala Tuple*.scala diff --git a/sources/scala/Function.java.tmpl b/sources/scala/Function.scala.tmpl index ed0e7ef30e..66ecda3dba 100644 --- a/sources/scala/Function.java.tmpl +++ b/sources/scala/Function.scala.tmpl @@ -10,8 +10,6 @@ package scala; -/** @meta class [{#ClassScalaTParams#}] extends java.lang.Object; */ -public interface Function{#n#} extends java.io.Serializable { - /** @meta method {#ApplyScalaSignature#}; */ - public abstract java.lang.Object apply({#ApplyJavaVParams#}); +trait Function{#n#}{#ClassSignature#} with java.io.Serializable { + def apply{#ApplySignature#}; } |