From a8731f5c35c605db1feeef4d5e9caba437d798f2 Mon Sep 17 00:00:00 2001
From: paltherr <paltherr@epfl.ch>
Date: Thu, 18 Nov 2004 09:26:12 +0000
Subject: - Replaced Function*.java by Function*.scala

---
 sources/meta/scala/MetaFunction.java | 20 ++++++++------------
 sources/scala/.cvsignore             |  2 +-
 sources/scala/Function.java.tmpl     | 17 -----------------
 sources/scala/Function.scala.tmpl    | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 100644 sources/scala/Function.java.tmpl
 create mode 100644 sources/scala/Function.scala.tmpl

(limited to 'sources')

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.java.tmpl
deleted file mode 100644
index ed0e7ef30e..0000000000
--- a/sources/scala/Function.java.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2004, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-// $Id$
-
-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#});
-}
diff --git a/sources/scala/Function.scala.tmpl b/sources/scala/Function.scala.tmpl
new file mode 100644
index 0000000000..66ecda3dba
--- /dev/null
+++ b/sources/scala/Function.scala.tmpl
@@ -0,0 +1,15 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2002-2004, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |                                         **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
+
+// $Id$
+
+package scala;
+
+trait Function{#n#}{#ClassSignature#} with java.io.Serializable {
+  def apply{#ApplySignature#};
+}
-- 
cgit v1.2.3