| OLD | NEW |
| 1 # Copyright 2013 the V8 project authors. All rights reserved. | 1 # Copyright 2013 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 continue | 142 continue |
| 143 # do goto replacement | 143 # do goto replacement |
| 144 counters['gotos'] += 1 | 144 counters['gotos'] += 1 |
| 145 match_action = ('goto', name(transition_state)) | 145 match_action = ('goto', name(transition_state)) |
| 146 new_state['action'] = replacement_action(state.action(), match_action) | 146 new_state['action'] = replacement_action(state.action(), match_action) |
| 147 # will need to patch up transition_state | 147 # will need to patch up transition_state |
| 148 store_states.add(name(transition_state)) | 148 store_states.add(name(transition_state)) |
| 149 assert not state_replacements | 149 assert not state_replacements |
| 150 self.__dfa.visit_all_states(replace_state) | 150 self.__dfa.visit_all_states(replace_state) |
| 151 # now patch up all states with stores | 151 # now patch up all states with stores |
| 152 for state in store_states: | 152 for state_id in store_states: |
| 153 old_action = states[state]['action'] | 153 old_action = states[state_id]['action'] |
| 154 match_action = ('do_stored_token', None) | 154 match_action = ('do_stored_token', state_id) |
| 155 states[state]['action'] = replacement_action(old_action, match_action) | 155 states[state_id]['action'] = replacement_action(old_action, match_action) |
| 156 start_name = name(self.__dfa.start_state()) | 156 start_name = name(self.__dfa.start_state()) |
| 157 if self.__log: | 157 if self.__log: |
| 158 print 'gotos inserted %s' % counters['gotos'] | 158 print 'gotos inserted %s' % counters['gotos'] |
| 159 print 'transitions removed %s' % counters['removals'] | 159 print 'transitions removed %s' % counters['removals'] |
| 160 print 'do_stored_token actions added %s' % len(store_states) | 160 print 'do_stored_token actions added %s' % len(store_states) |
| 161 self.__dfa = Dfa(self.__dfa.encoding(), start_name, states) | 161 self.__dfa = Dfa(self.__dfa.encoding(), start_name, states) |
| 162 | 162 |
| 163 @staticmethod | 163 @staticmethod |
| 164 def optimize(dfa, log): | 164 def optimize(dfa, log): |
| 165 optimizer = DfaOptimizer(dfa, log) | 165 optimizer = DfaOptimizer(dfa, log) |
| 166 optimizer.replace_tokens_with_gotos() | 166 optimizer.replace_tokens_with_gotos() |
| 167 return optimizer.__dfa | 167 return optimizer.__dfa |
| OLD | NEW |