summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2004-03-15 15:32:58 +0000
committerMartin Odersky <odersky@gmail.com>2004-03-15 15:32:58 +0000
commit2ebbfcd94be84b311fdddbe54c5f033d02593122 (patch)
tree9ee75fc47674fd0221a0d30b00e0dcd5537cc894
parent435fe5da695f35581f03b5a739d2ed5e8f58842c (diff)
downloadscala-2ebbfcd94be84b311fdddbe54c5f033d02593122.tar.gz
scala-2ebbfcd94be84b311fdddbe54c5f033d02593122.tar.bz2
scala-2ebbfcd94be84b311fdddbe54c5f033d02593122.zip
*** empty log message ***
-rw-r--r--sources/scala/tools/scalac/ast/parser/Scanner.scala5
-rw-r--r--sources/scala/tools/scalac/typechecker/Coerce.scala15
2 files changed, 17 insertions, 3 deletions
diff --git a/sources/scala/tools/scalac/ast/parser/Scanner.scala b/sources/scala/tools/scalac/ast/parser/Scanner.scala
index ab6d307c0c..b9c83ce091 100644
--- a/sources/scala/tools/scalac/ast/parser/Scanner.scala
+++ b/sources/scala/tools/scalac/ast/parser/Scanner.scala
@@ -580,7 +580,7 @@ class Scanner(_unit: Unit) extends TokenData {
var i = 0;
val len = name.length();
while (i < len) {
- val d = SourceRepresentation.digit2int(name sub i, base);
+ val d = SourceRepresentation.digit2int(name.charAt(i).asInstanceOf[byte], base);
if (d < 0) {
syntaxError("malformed integer number");
return 0;
@@ -639,8 +639,7 @@ class Scanner(_unit: Unit) extends TokenData {
(ch1 >= 'A' && ch1 <= 'Z') ||
(ch1 >= '0' && ch1 <= '9') ||
ch1 == '$' || ch1 == '_') {
- makeInt(index, bp - index, base, Integer.MAX_VALUE);
- intVal = intVal.asInstanceOf[int];
+ name = Name.fromAscii(buf, index, bp - index);
token = INTLIT;
} else
getFraction(index);
diff --git a/sources/scala/tools/scalac/typechecker/Coerce.scala b/sources/scala/tools/scalac/typechecker/Coerce.scala
new file mode 100644
index 0000000000..485e8e519e
--- /dev/null
+++ b/sources/scala/tools/scalac/typechecker/Coerce.scala
@@ -0,0 +1,15 @@
+/* ____ ____ ____ ____ ______ *\
+** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala **
+** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL **
+** /_____/\____/\___/\____/____/ **
+**
+** $Id$
+\* */
+import scalac.symtab._;
+import scalac.ast._;
+
+package scala.tools.scalac.typechecker {
+
+case class Coerce(sym: Symbol, symtype: Type, qual: Tree, context: Context);
+
+}