[Javapathfinder-svn] SF.net SVN: javapathfinder:[1888] branches/mango/Mango

[<fra...@us...>]

Revision: 1888
          http://javapathfinder.svn.sourceforge.net/javapathfinder/?rev=1888&view=rev
Author:   frankrimlinger
Date:     2009-09-03 18:11:02 +0000 (Thu, 03 Sep 2009)

Log Message:
-----------
It turns out that the annotation object exists at the transition level, not the step level as indicated in 1884.  But thats ok, just store a MangoAnnotation.  Inside the MangoAnnotation, there is a HashMap that maps each step to its MangoState.  

Wired in branching logic for Vertex and Edge.  Decided there was no need for separate listener for branching, so this is in the RewriteListener.

TODO: Vertex.firstExecuted() in particular, the issue splicing of totalState with the previous transition needs to be figured out.  

Vertex.instructionExecuted() needs to compose with state of the previous edge.  Also, if there is no outgoing edge, then needs to wait on message to complete the specification for this case.  NB: NOT to be confused with no "next pc", which just means we are at the end of a transition.

Edge.instructionExecuted() needs to do a lot of stuff.  Assumption of branch conditions, module instantiation, and setting up its mango state, which is previous composed with trivial or the instantiated module state.  (The whole point of assuming the branch condition is to make it go away).  Also buried in here will be the user stuff to help out with translation issues, so there will have to be a "Go" button after all so the user can indicate when ready to continue.

Modified Paths:
--------------
    branches/mango/Mango/Mango/src/mango/worker/utilities/Set.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/MangoState.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/RewriteChoiceGenerator.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/RewriteListener.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/synthetic/Edge.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/synthetic/Graphic.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/synthetic/InvokeRewriter.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/synthetic/Vertex.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/Boolean_MangoFormal.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/Character_MangoFormal.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/Class_MangoFormal.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/Double_MangoFormal.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/Integer_MangoFormal.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/Math_MangoFormal.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/Short_MangoFormal.java
    branches/mango/Mango/mangoUserHome/system/System/java/lang/System_MangoFormal.java

Added Paths:
-----------
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/MangoAnnotation.java
    branches/mango/Mango/javapathfinder-mango-bridge/mango/rewriter/synthetic/RewriterInstruction.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.