summaryrefslogtreecommitdiff
path: root/src/fjbg
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-11-14 18:02:10 +0000
committerPaul Phillips <paulp@improving.org>2009-11-14 18:02:10 +0000
commit1cd31e2edd031c0d32266de54ef63ddb9233c047 (patch)
tree4659619c1b3532ce4b31b2f4b52f912d64dff188 /src/fjbg
parent6c4064a77086ee82de861ec30dfd87fe120c6b0d (diff)
downloadscala-1cd31e2edd031c0d32266de54ef63ddb9233c047.tar.gz
scala-1cd31e2edd031c0d32266de54ef63ddb9233c047.tar.bz2
scala-1cd31e2edd031c0d32266de54ef63ddb9233c047.zip
Fixes and test cases for #2087 and #2400.
fixing a long-standing bug in fjbg and recompiling fjbg.jar, which had the side effect of revealing that the current fjbg jar had never been recompiled with target 1.5, so now it's smaller and (I imagine) faster.
Diffstat (limited to 'src/fjbg')
-rw-r--r--src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java b/src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java
index b8f29a6a2b..6ee18a59df 100644
--- a/src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java
+++ b/src/fjbg/ch/epfl/lamp/fjbg/JExtendedCode.java
@@ -74,7 +74,7 @@ public class JExtendedCode extends JCode {
},
{
/* T_SHORT -> T_BOOLEAN */ forbidden,
- /* T_SHORT -> T_CHAR */ nothingToDo,
+ /* T_SHORT -> T_CHAR */ {JOpcode.I2C},
/* T_SHORT -> T_FLOAT */ {JOpcode.I2F},
/* T_SHORT -> T_DOUBLE */ {JOpcode.I2D},
/* T_SHORT -> T_BYTE */ {JOpcode.I2B},