From 7f8a733c0d3e0e70797db043e30be0ce8cb41ff3 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Thu, 3 Sep 2009 20:55:35 +0000
Subject: Getting docs.comp building again.

---
 build.xml                                               |  1 +
 src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 1a309c6f05..68011a2421 100644
--- a/build.xml
+++ b/build.xml
@@ -776,6 +776,7 @@ PACKED QUICK BUILD (PACK)
       <pathelement location="${build-pack.dir}/lib/scala-partest.jar"/>
       <pathelement location="${build-pack.dir}/lib/scalap.jar"/>
       <pathelement location="${ant.jar}"/>
+      <pathelement location="${jline.jar}"/>
     </path>
     <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.classpath"/>
     <taskdef resource="scala/tools/partest/antlib.xml" classpathref="pack.classpath"/>
diff --git a/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala b/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala
index 360baf0a8c..a94d4c100a 100644
--- a/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala
+++ b/src/compiler/scala/tools/nsc/backend/msil/GenMSIL.scala
@@ -494,7 +494,7 @@ abstract class GenMSIL extends SubComponent {
           if (settings.debug.value)
             log("auto-generating cloneable method for " + sym)
           val attrs: Short = (MethodAttributes.Public | MethodAttributes.Virtual |
-                              MethodAttributes.HideBySig)
+                              MethodAttributes.HideBySig).toShort
           val cloneMethod = tBuilder.DefineMethod("Clone", attrs, MOBJECT,
                                                   MsilType.EmptyTypes)
           val clCode = cloneMethod.GetILGenerator()
@@ -2212,8 +2212,8 @@ abstract class GenMSIL extends SubComponent {
 
           // CHECK: verify if getMethodName is better than msilName
           val mirrorMethod = mirrorTypeBuilder.DefineMethod(getMethodName(m),
-                                                            MethodAttributes.Public |
-                                                            MethodAttributes.Static,
+                                                            (MethodAttributes.Public |
+                                                            MethodAttributes.Static).toShort,
                                                             msilType(m.tpe.resultType),
                                                             paramTypes)
 
@@ -2256,7 +2256,7 @@ abstract class GenMSIL extends SubComponent {
       val mFunctionType: MsilType = msilType(functionType)
       val anonfunField: FieldBuilder = delegateCallers.DefineField(
         "$anonfunField$$" + nbDelegateCallers, mFunctionType,
-        FieldAttributes.InitOnly | FieldAttributes.Public | FieldAttributes.Static)
+        (FieldAttributes.InitOnly | FieldAttributes.Public | FieldAttributes.Static).toShort)
       mcode.Emit(OpCodes.Stsfld, anonfunField)
 
 
@@ -2267,7 +2267,7 @@ abstract class GenMSIL extends SubComponent {
       }
       val caller: MethodBuilder = delegateCallers.DefineMethod(
         "$delegateCaller$$" + nbDelegateCallers,
-        MethodAttributes.Final | MethodAttributes.Public | MethodAttributes.Static,
+        (MethodAttributes.Final | MethodAttributes.Public | MethodAttributes.Static).toShort,
         msilType(returnType), (params map (_.tpe)).map(msilType).toArray)
       for (i <- 0 until params.length)
         caller.DefineParameter(i, ParameterAttributes.None, "arg" + i) // FIXME: use name of parameter symbol
-- 
cgit v1.2.3