Include character even in "anywhere" transitions

2011-01-10 04:25:00 -05:00
parent 3174e4f659
commit 06697abb23
1 changed files with 7 additions and 11 deletions
@@ -29,17 +29,13 @@ Transition State::anywhere_rule( wchar_t ch )

 Transition State::input( wchar_t ch )
 {
-  Transition any = anywhere_rule( ch );
-  if ( any.next_state ) {
-    return any;
-  }
-
-  Transition ret;
-
-  if ( ch >= 0xA0 ) {
-    ret = this->input_state_rule( 0x41 );
-  } else {
-    ret = this->input_state_rule( ch );
+  Transition ret = anywhere_rule( ch );
+  if ( !ret.next_state ) {
+    if ( ch >= 0xA0 ) {
+      ret = this->input_state_rule( 0x41 );
+    } else {
+      ret = this->input_state_rule( ch );
+    }
  }

  ret.action.char_present = true;