From: <pcm...@us...> - 2007-02-26 07:40:57
|
Revision: 264 http://javapathfinder.svn.sourceforge.net/javapathfinder/?rev=264&view=rev Author: pcmehlitz Date: 2007-02-25 23:40:55 -0800 (Sun, 25 Feb 2007) Log Message: ----------- * search.multiple_errors had an error - if we bail out of JVM.forward() with an UncaughtException (this thing REALLY has to go away, I'm saying that since 3 years), we need to store the SystemState or backtracking & continue does get out of sync (CG doesn't get properly backtracked) * SystemState.setIgnored() can now also be called from a choiceGeneratorAdvanced() notification, i.e. before we execute any code in this transition. Be aware that - even if it's possible - one should not do any deferred CGs if that feature is used * the big thing was rewriting the StateMachine so that 'completion' events are treated like normal events, i.e. handled on the native peer / subclass side. This eliminates the need for the imfamous non-consumed, and esp. the on-demand expanded SCEventFromAlphabet CGs. They were just a nightmare, code is much cleaner now * updated SimStateMachine to use this scheme * fixed PathConstraints, added an ad hoc, greedy complement event ~<someevent> to better suit flight rules, but the script syntax needs to be reworked * added an 'choice.exclude' filter for the ChoiceTracker, to filter out things like 'completion' or 'NONE' * updated UIInspector accordingly Modified Paths: -------------- trunk/extensions/statechart/env/jpf/gov/nasa/jpf/sc/StateMachine.java trunk/extensions/statechart/env/jvm/gov/nasa/jpf/jvm/JPF_gov_nasa_jpf_sc_StateMachine.java trunk/extensions/statechart/src/gov/nasa/jpf/jvm/choice/sc/SCEvent.java trunk/extensions/statechart/src/gov/nasa/jpf/jvm/choice/sc/SCEventFromSet.java trunk/extensions/statechart/src/gov/nasa/jpf/jvm/choice/sc/SCEventGenerator.java trunk/extensions/statechart/src/gov/nasa/jpf/jvm/choice/sc/SCEventGeneratorFactory.java trunk/extensions/statechart/src/gov/nasa/jpf/jvm/choice/sc/SCEventSingleChoice.java trunk/extensions/statechart/src/gov/nasa/jpf/tools/sc/PathConstraint.java trunk/extensions/statechart/src/gov/nasa/jpf/tools/sc/SimStateMachine.java trunk/extensions/ui/src/gov/nasa/jpf/tools/UIInspector.java trunk/src/gov/nasa/jpf/jvm/ClassInfo.java trunk/src/gov/nasa/jpf/jvm/JVM.java trunk/src/gov/nasa/jpf/jvm/SystemState.java trunk/src/gov/nasa/jpf/tools/ChoiceTracker.java trunk/src/gov/nasa/jpf/util/script/ESParser.java Removed Paths: ------------- trunk/extensions/statechart/src/gov/nasa/jpf/jvm/choice/sc/NullSCEventGenerator.java trunk/extensions/statechart/src/gov/nasa/jpf/jvm/choice/sc/SCEventFromAlphabet.java This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |