Changeset 13987


Ignore:
Timestamp:
2012-11-20T14:05:24+01:00 (11 years ago)
Author:
perost
Message:
  • Fix compilation.
Location:
trunk/Compiler/FrontEnd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Compiler/FrontEnd/InstSymbolTable.mo

    r13986 r13987  
    264264
    265265    // A basic type doesn't have any components, nothing to add.
    266     case (InstTypes.BASIC_TYPE(name), st) then (inClass, st);
     266    case (InstTypes.BASIC_TYPE(name), st) then st;
    267267
    268268    // A complex class, add its components to the symboltable.
     
    319319  input SymbolTable inSymbolTable;
    320320  input Boolean inCondition;
    321   output Class outClass;
    322   output SymbolTable outSymbolTable;
    323 algorithm
    324   (outClass, outSymbolTable) := match(inClass, inSymbolTable, inCondition)
     321  output SymbolTable outSymbolTable;
     322algorithm
     323  outSymbolTable := match(inClass, inSymbolTable, inCondition)
    325324    local
    326325      Class cls;
    327326      SymbolTable st;
    328327
    329     case (cls, st, false) then (cls, st);
     328    case (cls, st, false) then st;
    330329    case (cls, st, true)
    331330      equation
    332         (cls, st) = addClass(cls, st);
    333       then
    334         (cls, st);
     331        st = addClass(cls, st);
     332      then
     333        st;
    335334
    336335  end match;
     
    592591        (st, added) = addInstCondComponent(name, comp, opt_comp, st);
    593592        // Add the element's class if the component was added.
    594         (cls, st) = addClassOnTrue(cls, st, added);
     593        st = addClassOnTrue(cls, st, added);
    595594      then
    596595        (st, added);
  • trunk/Compiler/FrontEnd/SCodeInst.mo

    r13986 r13987  
    22982298          InstTypes.NO_PREFIXES(), env, InstTypes.emptyPrefix, INST_ALL(), inGlobals);
    22992299
    2300         (_, consts) = InstSymbolTable.addElement(elem, consts);
     2300        consts = InstSymbolTable.addElement(elem, consts);
    23012301      then
    23022302        ((consts, funcs));
     
    23452345          InstTypes.NO_PREFIXES(), env, prefix, INST_ALL(), inGlobals);
    23462346
    2347         (_, consts) = InstSymbolTable.addElement(elem, consts);
     2347        consts = InstSymbolTable.addElement(elem, consts);
    23482348      then
    23492349        ((consts, funcs));
Note: See TracChangeset for help on using the changeset viewer.