diff options
| author | paltherr <paltherr@epfl.ch> | 2003-10-14 08:48:13 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-10-14 08:48:13 +0000 |
| commit | 0f26e2f6ed6e8cb73b7c192902b79e0bbf1ec0c9 (patch) | |
| tree | 51a4fbfb44260f5d0039d547bd6944e58f998fc1 /sources/scalac/transformer/matching/Autom2Scala.java | |
| parent | 67f1003ff65802bd8c673b6012925113e6b569a5 (diff) | |
| download | scala-0f26e2f6ed6e8cb73b7c192902b79e0bbf1ec0c9.tar.gz scala-0f26e2f6ed6e8cb73b7c192902b79e0bbf1ec0c9.tar.bz2 scala-0f26e2f6ed6e8cb73b7c192902b79e0bbf1ec0c9.zip | |
- Moved symbols from CodeFactory into Definitions
- Reorganized Definitions
Diffstat (limited to 'sources/scalac/transformer/matching/Autom2Scala.java')
| -rw-r--r-- | sources/scalac/transformer/matching/Autom2Scala.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sources/scalac/transformer/matching/Autom2Scala.java b/sources/scalac/transformer/matching/Autom2Scala.java index cf836229c6..49b18f2943 100644 --- a/sources/scalac/transformer/matching/Autom2Scala.java +++ b/sources/scalac/transformer/matching/Autom2Scala.java @@ -154,9 +154,9 @@ public class Autom2Scala { cf.gen.ValDef( this.hasnSym, cf._hasNext( _iter() ) ), cf.gen.ValDef( this.curSym, - cf.If( gen.Ident( pos, hasnSym ),//cf._hasNext( _iter() ), - cf._next( _iter() ), - gen.mkDefaultValue(cf.pos,curSym.type()))), + gen.If( gen.Ident( pos, hasnSym ),//cf._hasNext( _iter() ), + cf._next( _iter() ), + gen.mkDefaultValue(cf.pos,curSym.type()))), //cf.ignoreValue( curSym.type() ) body }); @@ -209,9 +209,9 @@ public class Autom2Scala { if( dfa.isSink( i )) bodies[ i ] = run_finished( i ); // state won't change! else - bodies[ i ] = cf.If( cf.Negate( gen.Ident( pos, hasnSym )),//cf._not_hasNext( _iter() ), - run_finished( i ), - code_state_NEW( i )); + bodies[ i ] = gen.If( cf.Negate( gen.Ident( pos, hasnSym )),//cf._not_hasNext( _iter() ), + run_finished( i ), + code_state_NEW( i )); } if( optimize ) return loadCurrentElem( gen.Switch( _state(), @@ -222,9 +222,9 @@ public class Autom2Scala { Tree res = code_fail(); for( int i = dfa.nstates-2; i>= 0; i-- ) - res = cf.If( cf.Equals( _state(), gen.mkIntLit( cf.pos, i )), - bodies[ i ] , - res ); + res = gen.If( cf.Equals( _state(), gen.mkIntLit( cf.pos, i )), + bodies[ i ] , + res ); return loadCurrentElem( res ); @@ -302,9 +302,9 @@ public class Autom2Scala { if( action != null ) { - stateBody = cf.If( currentMatches((Label) label ), - action, - stateBody); + stateBody = gen.If( currentMatches((Label) label ), + action, + stateBody); } } return stateBody; |