diff options
| author | mihaylov <mihaylov@epfl.ch> | 2004-01-26 18:47:14 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2004-01-26 18:47:14 +0000 |
| commit | 3d7fe86ae7c38e430808f09ec61ba71ca4592bd2 (patch) | |
| tree | ad9300ef54acd33786b9d391609bafdcd49fdf41 /sources | |
| parent | 91945ebb951fdbb5428bf13e1bb8ec2b7b5a8177 (diff) | |
| download | scala-3d7fe86ae7c38e430808f09ec61ba71ca4592bd2.tar.gz scala-3d7fe86ae7c38e430808f09ec61ba71ca4592bd2.tar.bz2 scala-3d7fe86ae7c38e430808f09ec61ba71ca4592bd2.zip | |
*** empty log message ***
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scalac/backend/msil/TypeCreator.java | 15 | ||||
| -rw-r--r-- | sources/scalac/symtab/classfile/CLRPackageParser.java | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/sources/scalac/backend/msil/TypeCreator.java b/sources/scalac/backend/msil/TypeCreator.java index c11361381e..f555531650 100644 --- a/sources/scalac/backend/msil/TypeCreator.java +++ b/sources/scalac/backend/msil/TypeCreator.java @@ -81,6 +81,8 @@ final class TypeCreator { final MethodInfo MONITOR_PULSE_ALL; final MethodInfo MONITOR_WAIT; final MethodInfo MONITOR_WAIT_TIMEOUT; + final MethodInfo MONITOR_ENTER; + final MethodInfo MONITOR_EXIT; Type SCALA_BYTE; Type SCALA_SHORT; @@ -134,16 +136,19 @@ final class TypeCreator { MONITOR = Type.GetType("System.Threading.Monitor"); + final Type[] sObject1 = new Type[] {OBJECT}; + //CONCAT_OBJECT = STRING.GetMethod("Concat", new Type[] {OBJECT}); //CONCAT_STRING_STRING = STRING.GetMethod("Concat", new Type[] {STRING, STRING}); CONCAT_OBJECT_OBJECT = STRING.GetMethod("Concat", new Type[] {OBJECT, OBJECT}); - OBJECT_EQUALS = OBJECT.GetMethod("Equals", new Type[] {OBJECT}); - MONITOR_PULSE = MONITOR.GetMethod("Pulse", new Type[] {OBJECT}); - MONITOR_PULSE_ALL = MONITOR.GetMethod("PulseAll", new Type[] {OBJECT}); - MONITOR_WAIT = MONITOR.GetMethod("Wait", new Type[] {OBJECT}); + OBJECT_EQUALS = OBJECT.GetMethod("Equals", sObject1); + MONITOR_PULSE = MONITOR.GetMethod("Pulse", sObject1); + MONITOR_PULSE_ALL = MONITOR.GetMethod("PulseAll", sObject1); + MONITOR_WAIT = MONITOR.GetMethod("Wait", sObject1); MONITOR_WAIT_TIMEOUT = MONITOR.GetMethod("Wait", new Type[] {OBJECT, INT}); - + MONITOR_ENTER = MONITOR.GetMethod("Enter", sObject1); + MONITOR_EXIT = MONITOR.GetMethod("Exit", sObject1); } private boolean initialized = false; diff --git a/sources/scalac/symtab/classfile/CLRPackageParser.java b/sources/scalac/symtab/classfile/CLRPackageParser.java index 3197389979..801197c925 100644 --- a/sources/scalac/symtab/classfile/CLRPackageParser.java +++ b/sources/scalac/symtab/classfile/CLRPackageParser.java @@ -98,7 +98,7 @@ public class CLRPackageParser extends MetadataParser { findAssembly("vjslib.dll"); findAssembly("scala.dll"); - findAssembly("scala_sc.dll"); + findAssembly("scalalib.dll"); findAllAssemblies(); Type[] types = Type.EmptyTypes; |