From: <pcm...@us...> - 2008-03-26 20:26:37
|
Revision: 794 http://javapathfinder.svn.sourceforge.net/javapathfinder/?rev=794&view=rev Author: pcmehlitz Date: 2008-03-26 13:26:34 -0700 (Wed, 26 Mar 2008) Log Message: ----------- * added pattern matching for receiver constraints in event scripts. This is never going to end <SIGH>. We have to push the filtering down into the alphabet inspection, since we have to add the receiver to the list of candidates in case there is a receiverConstraint. Otherwise we might just add the event id, even though there is a constraint in the script, and then get surprised during executeTrigger() because there is another active state that has this trigger method. If there already is an rc-event with the same event name in the set, add the active state field name to the rc. If there is the same event name but no rc, then it's pointless to add a constraint this also unveiled a little bug with a forgotten matcher for SCEventSingleChoice Modified Paths: -------------- trunk/extensions/statechart/env/jvm/gov/nasa/jpf/jvm/NativeStateMachine.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/SCEventSingleChoice.java trunk/extensions/statechart/src/gov/nasa/jpf/tools/sc/SCInspector.java trunk/extensions/statechart/src/gov/nasa/jpf/tools/sc/SimStateMachine.java trunk/src/gov/nasa/jpf/util/script/ScriptEnvironment.java This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |