Changeset 13781


Ignore:
Timestamp:
Oct 17, 2019 4:34:29 PM (5 weeks ago)
Author:
molsson
Message:

#5843 Moved computeFlatName call to inside if-statement.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Compiler/ModelicaCompiler/src/jastadd/ModelicaCompiler.jrag

    r13732 r13781  
    20452045            InstClassDecl icl = instantiateModel(name, cl, target);
    20462046            UtilInterface util = icl.root().getUtilInterface();
     2047            String flatName = null;
    20472048            if (compileTo != null) {
    20482049                Path unitFile = makePackagingDirs(cl, compileTo, target);
    20492050                util.setCompilationOutputPath(unitFile);
     2051                flatName = computeFlatName(compileTo, util);
    20502052            }
    2051            
    2052             String flatName = computeFlatName(compileTo, util);
    20532053           
    20542054            // flattening
     
    22802280    private String ModelicaCompiler.computeFlatName(Path compileTo, UtilInterface util) {
    22812281        String flatName = null;
    2282         if (compileTo != null && !Files.isDirectory(compileTo)) {
     2282        if (!Files.isDirectory(compileTo)) {
    22832283            flatName = compileTo.getFileName().toString();
    22842284            int i = flatName.lastIndexOf('.');
Note: See TracChangeset for help on using the changeset viewer.