Changeset 2167

Show
Ignore:
Timestamp:
07/03/08 07:43:27 (3 months ago)
Author:
nbeckman
Message:

[demos] All four of these files has disambiguation errors.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ProjectFortress/demos/Cfa.fss

    r2041 r2167  
    324324 *) 
    325325collectVars(name: String, e: If) = 
    326   colelctVars(name, e.thenB) UNION colelctVars(name, e.elseB) 
     326  collectVars(name, e.thenB) UNION collectVars(name, e.elseB) 
    327327 
    328328(* Add control flow equations into the cfa_eqns table. *************************) 

  • trunk/ProjectFortress/demos/Lambda.fss

    r1771 r2167  
    177177        t 
    178178    else 
    179         freeVar(global) 
     179        fv(global) 
    180180    end 
    181181 
    …… 
    259259            ')'  => fail ("unexpected ')' in arg list, last arg " id) 
    260260            else => if curr IN digits then 
    261                         fail ("unexpected digit " c2.toString() " in arg list") 
     261                        fail ("unexpected digit " curr.toString() " in arg list") 
    262262                    else 
    263263                        mkLambda(id,parseLambdaF(newlineOK)) 

  • trunk/ProjectFortress/demos/aStar.fss

    r1775 r2167  
    302302        st0 
    303303    else 
    304         fail("Bad initial state:" // res) 
     304        fail("Bad initial state:" // st0) 
    305305    end 
    306306 

  • trunk/ProjectFortress/demos/tennisRanking.fss

    r1778 r2167  
    388388  then if database.member(loserName) 
    389389       then addGame(fout, winnerName, true, loserName, true) 
    390        else println loserName " is a new member!"; die end 
    391   else println winnerName " is a new member!"; die end 
     390       else println loserName " is a new member!"; fail("end") end 
     391  else println winnerName " is a new member!"; fail("end") end 
    392392 
    393393(* doubles games ****************************************) 
    …… 
    478478                 then addGame(fout, winnerName1, true, winnerName2, true, 
    479479                                    loserName1 , true, loserName2 , true) 
    480                  else println loserName2 " is a new member!"; die end 
    481             else println loserName1 " is a new member!"; die end 
    482        else println winnerName2 " is a new member!"; die end 
    483   else println winnerName1 " is a new member!"; die end 
     480                 else println loserName2 " is a new member!"; fail("end") end 
     481            else println loserName1 " is a new member!"; fail("end") end 
     482       else println winnerName2 " is a new member!"; fail("end") end 
     483  else println winnerName1 " is a new member!"; fail("end") end 
    484484 
    485485(* Print result ***************************************************************)