Changeset 13901


Ignore:
Timestamp:
Oct 29, 2019 2:52:41 PM (3 weeks ago)
Author:
mjohnsson
Message:

recommit #5847 & #1524

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Compiler/ModelicaFrontEnd/src/jastadd/ast/Modelica.ast

    r13889 r13901  
    277277SrcWhileStmt           : SrcStatement ::= Test:SrcExp SrcWhileStmt:SrcStatement*;
    278278
     279SrcFunctionCallList    ::= ConvertRules:SrcFunctionCall*;
     280
    279281SrcParExp    : SrcExp ::= SrcExp;
    280282SrcIfExp     : SrcExp ::= SrcIfExp:SrcExp ThenExp:SrcExp ElseExp:SrcExp;
  • trunk/Compiler/ModelicaFrontEnd/src/jastadd/source/Parser.jrag

    r13889 r13901  
    181181    }
    182182
     183    public short ParserHandler.functionCallListGoal() {
     184        return org.jmodelica.modelica.parser.ModelicaParser.AltGoals.function_call_list;
     185    }
     186
    183187    public SourceRoot ParserHandler.parseFile(UtilInterface uif, LoadInfo loadInfo)
    184188            throws ParserException, beaver.Parser.Exception, FileNotFoundException, IOException {
  • trunk/Compiler/ModelicaFrontEnd/src/parser/Modelica.parser

    r13889 r13901  
    2323%goal access_scalar;
    2424%goal subscript;
     25%goal function_call_list;
    2526
    2627%header {:
     
    4142
    4243%embed {:
    43 
    4444    /**
    4545     * Error reporting class that creates an error message and delegates reporting the
     
    17001700    :}
    17011701    ;
     1702
     1703//Extension
     1704List function_calls_stmt =
     1705    function_call SEMICOLON                   {: return new List().add(function_call); :}
     1706  | function_calls_stmt function_call SEMICOLON    {: return function_calls_stmt.add(function_call); :}
     1707  ;
     1708
     1709List function_calls_vector =
     1710    function_call                              {: return new List().add(function_call); :}
     1711  | function_calls_vector COMMA function_call  {: return function_calls_vector.add(function_call); :}
     1712  ;
     1713
     1714SrcFunctionCallList function_call_list
     1715    = LBRACE function_calls_vector RBRACE
     1716    {:
     1717        return new SrcFunctionCallList(function_calls_vector);
     1718    :}
     1719    | function_calls_stmt
     1720    {:
     1721        return new SrcFunctionCallList(function_calls_stmt);
     1722    :}
     1723    ;
  • trunk/Compiler/ModelicaFrontEnd/src/parser/Modelica_header.beaver

    r13889 r13901  
    2323%left MULT, DIV;
    2424%left PLUS, MINUS;
    25 
  • trunk/Compiler/OptimicaFrontEnd/src/jastadd/OptimicaParser.jrag

    r13889 r13901  
    6868        return org.jmodelica.optimica.parser.ModelicaParser.AltGoals.subscript;
    6969    }
     70   
     71    refine Parsers public short ParserHandler.functionCallListGoal() {
     72        return org.jmodelica.optimica.parser.ModelicaParser.AltGoals.function_call_list;
     73    }
     74
    7075
    7176    public beaver.Parser ParserHandler.createOptimicaParser(AbstractModelicaScanner<ASTNode<?>> scanner, LoadInfo loadInfo) {
  • trunk/RuntimeLibrary/src

Note: See TracChangeset for help on using the changeset viewer.