diff options
| author | buraq <buraq@epfl.ch> | 2003-06-23 16:55:16 +0000 |
|---|---|---|
| committer | buraq <buraq@epfl.ch> | 2003-06-23 16:55:16 +0000 |
| commit | f29ec2158b34fc7d8ca8b206aed7659618aa7772 (patch) | |
| tree | 4c232141f2a78ab842b7cf158e86a06e21a56e85 | |
| parent | 70ae99e7ea4aeb424f1dd53a9f5eaa940f315f2c (diff) | |
| download | scala-f29ec2158b34fc7d8ca8b206aed7659618aa7772.tar.gz scala-f29ec2158b34fc7d8ca8b206aed7659618aa7772.tar.bz2 scala-f29ec2158b34fc7d8ca8b206aed7659618aa7772.zip | |
change to adapt to new iterators
| -rw-r--r-- | sources/scalac/transformer/matching/Autom2Scala.java | 8 | ||||
| -rw-r--r-- | sources/scalac/transformer/matching/WordAutomInScala.java | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sources/scalac/transformer/matching/Autom2Scala.java b/sources/scalac/transformer/matching/Autom2Scala.java index 151e41f35e..140d8a99c4 100644 --- a/sources/scalac/transformer/matching/Autom2Scala.java +++ b/sources/scalac/transformer/matching/Autom2Scala.java @@ -152,9 +152,11 @@ public class Autom2Scala { Symbol curSym; Tree loadCurrentElem() { - return cf.gen.ValDef( 0, - this.curSym, - cf._cur( _iter() )); + return cf.Block( Position.NOPOS, new Tree[] { + cf.gen.ValDef( 0, + this.curSym, + cf._cur( _iter() )), + cf._next( _iter() ) }, Type.NoType ); } Tree currentElem() { diff --git a/sources/scalac/transformer/matching/WordAutomInScala.java b/sources/scalac/transformer/matching/WordAutomInScala.java index 9da20870ab..a8da5d8652 100644 --- a/sources/scalac/transformer/matching/WordAutomInScala.java +++ b/sources/scalac/transformer/matching/WordAutomInScala.java @@ -71,7 +71,7 @@ public class WordAutomInScala extends Autom2Scala { else if( target.intValue() == dfa.nstates - 1 ) // that one is a dead state return code_fail(); - return callFun( new Tree[] {cf._next( _iter()), gen.mkIntLit(Position.NOPOS, target.intValue() )} ); + return callFun( new Tree[] { _iter(), gen.mkIntLit(Position.NOPOS, target.intValue() )} ); } public WordAutomInScala( DetWordAutom dfa, |