- Added Function expander and template

2 files changed, 76 insertions, 0 deletions

diff --git a/sources/meta/scala/MetaFunction.java b/sources/meta/scala/MetaFunction.java
new file mode 100644
index 0000000000..3bcf4cc4c6
--- /dev/null
+++ b/sources/meta/scala/MetaFunction.java
@@ -0,0 +1,59 @@
+/*     ____ ____  ____ ____  ______                                     *\
+**    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
+**  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
+** /_____/\____/\___/\____/____/                                        **
+\*                                                                      */
+
+// $Id$
+
+package meta.scala;
+
+import meta.java.AbstractJavaExpander;
+
+public class MetaFunction extends AbstractJavaExpander {
+
+    //########################################################################
+    // Public Fields
+
+    public final int arity;
+
+    //########################################################################
+    // Public Constructors
+
+    public MetaFunction(int arity) {
+        this.arity = arity;
+    }
+
+    //########################################################################
+    // Public Methods
+
+    public String getTargetBaseName() {
+        return super.getTargetBaseName() + arity;
+    }
+
+    public void printn() {
+        writer.print(arity);
+    }
+
+    public void printClassScalaTParams() {
+        for (int i = 0; i < arity; i++)
+            writer.print("?A").print(i).print(", ");
+        writer.print("?R");
+    }
+
+    public void printApplyScalaSignature() {
+        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);
+        }
+    }
+
+    //########################################################################
+}
diff --git a/sources/scala/Function.java.tmpl b/sources/scala/Function.java.tmpl
new file mode 100644
index 0000000000..ac99c80aab
--- /dev/null
+++ b/sources/scala/Function.java.tmpl
@@ -0,0 +1,17 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2002, LAMP/EPFL                  **
+**  __\ \/ /__/ __ |/ /__/ __ |                                         **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+// $Id$
+
+package scala;
+
+/** @meta class [{#ClassScalaTParams#}] extends scala.Object; */
+public interface Function{#n#} {
+    /** @meta method {#ApplyScalaSignature#}; */
+    public abstract java.lang.Object apply({#ApplyJavaVParams#});
+}