Changeset 13889


Ignore:
Timestamp:
Oct 29, 2019 9:30:18 AM (2 weeks ago)
Author:
mjohnsson
Message:

#5847 & #1524

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

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

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

    r13882 r13889  
    2323%goal access_scalar;
    2424%goal subscript;
    25 %goal function_call_list;
    2625
    2726%header {:
     
    4241
    4342%embed {:
     43
    4444    /**
    4545     * Error reporting class that creates an error message and delegates reporting the
     
    17001700    :}
    17011701    ;
    1702 
    1703 //Extension
    1704 List 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 
    1709 List 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 
    1714 SrcFunctionCallList 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

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

    r13887 r13889  
    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 
    7570
    7671    public beaver.Parser ParserHandler.createOptimicaParser(AbstractModelicaScanner<ASTNode<?>> scanner, LoadInfo loadInfo) {
  • trunk/RuntimeLibrary/src

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