Changeset 13594


Ignore:
Timestamp:
Sep 24, 2019 4:06:57 PM (2 months ago)
Author:
mjohnsson
Message:

#5847 Correct addition order in grammer.

Location:
branches/dev-mj-5847/Compiler/ModelicaFrontEnd/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-mj-5847/Compiler/ModelicaFrontEnd/src/jastadd/source/Parser.jrag

    r13577 r13594  
    295295    }
    296296
    297     private SrcFunctionCallList ParserHandler.parseFunctionCallList(Reader r, Path path)
    298             throws ParserException, beaver.Parser.Exception, IOException {
    299         LoadInfo fileloadInfo = LoadInfo.create(path);
    300         AbstractModelicaScanner<ASTNode<?>> scanner = createModelicaScanner(r);
    301         beaver.Parser parser = createModelicaParser(scanner, fileloadInfo);
    302         SrcFunctionCallList elem = (SrcFunctionCallList) parser.parse(scanner, functionCallListGoal());
    303         scanner.getFormattingRecorder().postParsing(elem);
    304         return elem;
    305     }
    306    
    307     public SrcFunctionCallList ParserHandler.parseFunctionCallList(String code, Path path)
    308             throws ParserException, beaver.Parser.Exception, IOException {
    309         return parseFunctionCallList(new StringReader(code), path);
    310     }
    311    
    312     public SrcFunctionCallList ParserHandler.parseFunctionCallList(Path path)
    313             throws ParserException, beaver.Parser.Exception, IOException {
    314         return parseFunctionCallList(fileReader(null, path.toFile()), path);
    315     }
    316 
    317297    public SrcAbstractEquation ParserHandler.parseAbstractEquation(String code, LoadInfo parentLoadInfo)
    318298            throws ParserException, beaver.Parser.Exception, IOException {
  • branches/dev-mj-5847/Compiler/ModelicaFrontEnd/src/parser/Modelica.parser

    r13577 r13594  
    15211521List function_calls =
    15221522    function_call SEMICOLON                       {: return new List().add(function_call); :}
    1523   | function_call SEMICOLON function_calls {: return function_calls.add(function_call); :}
     1523  | function_calls SEMICOLON function_call {: return function_calls.add(function_call); :}
    15241524  ;
    15251525
Note: See TracChangeset for help on using the changeset viewer.