clang-format SourceCompile header files
diff --git a/SVIncCompil/SourceCompile/AnalyzeFile.h b/SVIncCompil/SourceCompile/AnalyzeFile.h
index 58240ee..f964a63 100644
--- a/SVIncCompil/SourceCompile/AnalyzeFile.h
+++ b/SVIncCompil/SourceCompile/AnalyzeFile.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   AnalyzeFile.h
  * Author: alain
  *
@@ -27,55 +27,61 @@
 #include "IncludeFileInfo.h"
 
 namespace SURELOG {
-    class Design;
-       
+class Design;
+
 class AnalyzeFile {
-public:
-    
-    class FileChunk {
-    public: 
-        FileChunk (DesignElement::ElemType type, unsigned long from, unsigned long to, 
-                   unsigned long startChar, unsigned long endChar) : m_chunkType(type), m_fromLine(from), 
-                   m_toLine(to), m_excludeLineFrom(0), m_excludeLineTo(0), m_startChar(startChar), 
-                   m_endChar(endChar) {} 
-        DesignElement::ElemType m_chunkType;
-        unsigned long m_fromLine;
-        unsigned long m_toLine;
-        unsigned long m_excludeLineFrom;
-        unsigned long m_excludeLineTo;
-        unsigned long m_startChar;
-        unsigned long m_endChar;
-        
-    };
-    
-    
-    AnalyzeFile(CommandLineParser* clp, Design* design, std::string ppFileName, std::string fileName, int nbChunks) : 
-     m_clp(clp), m_design(design), m_ppFileName(ppFileName), m_fileName(fileName), m_nbChunks(nbChunks) {}
-    
-    void analyze();
-    std::vector<std::string>&  getSplitFiles()  { return m_splitFiles; }
-    std::vector<unsigned int>& getLineOffsets() { return m_lineOffsets; }
-    
-    AnalyzeFile(const AnalyzeFile& orig) = delete;
-    virtual ~AnalyzeFile() {}
-private:
-    void checkSLlineDirective_ (std::string line, unsigned int lineNb);
-    std::string setSLlineDirective_(unsigned int lineNb, unsigned int& origFromLine, std::string& origFile);
-    CommandLineParser*      m_clp;
-    Design*                 m_design;
-    std::string             m_ppFileName;
-    std::string             m_fileName;
-    std::vector<FileChunk>  m_fileChunks;
-    std::vector<std::string> m_splitFiles;
-    std::vector<unsigned int> m_lineOffsets;
-    int                     m_nbChunks;
-    std::stack<IncludeFileInfo> m_includeFileInfo;
+ public:
+  class FileChunk {
+   public:
+    FileChunk(DesignElement::ElemType type, unsigned long from,
+              unsigned long to, unsigned long startChar, unsigned long endChar)
+        : m_chunkType(type),
+          m_fromLine(from),
+          m_toLine(to),
+          m_excludeLineFrom(0),
+          m_excludeLineTo(0),
+          m_startChar(startChar),
+          m_endChar(endChar) {}
+    DesignElement::ElemType m_chunkType;
+    unsigned long m_fromLine;
+    unsigned long m_toLine;
+    unsigned long m_excludeLineFrom;
+    unsigned long m_excludeLineTo;
+    unsigned long m_startChar;
+    unsigned long m_endChar;
+  };
+
+  AnalyzeFile(CommandLineParser* clp, Design* design, std::string ppFileName,
+              std::string fileName, int nbChunks)
+      : m_clp(clp),
+        m_design(design),
+        m_ppFileName(ppFileName),
+        m_fileName(fileName),
+        m_nbChunks(nbChunks) {}
+
+  void analyze();
+  std::vector<std::string>& getSplitFiles() { return m_splitFiles; }
+  std::vector<unsigned int>& getLineOffsets() { return m_lineOffsets; }
+
+  AnalyzeFile(const AnalyzeFile& orig) = delete;
+  virtual ~AnalyzeFile() {}
+
+ private:
+  void checkSLlineDirective_(std::string line, unsigned int lineNb);
+  std::string setSLlineDirective_(unsigned int lineNb,
+                                  unsigned int& origFromLine,
+                                  std::string& origFile);
+  CommandLineParser* m_clp;
+  Design* m_design;
+  std::string m_ppFileName;
+  std::string m_fileName;
+  std::vector<FileChunk> m_fileChunks;
+  std::vector<std::string> m_splitFiles;
+  std::vector<unsigned int> m_lineOffsets;
+  int m_nbChunks;
+  std::stack<IncludeFileInfo> m_includeFileInfo;
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* ANALYZEFILE_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/AntlrParserErrorListener.h b/SVIncCompil/SourceCompile/AntlrParserErrorListener.h
index c94a99d..3d65327 100644
--- a/SVIncCompil/SourceCompile/AntlrParserErrorListener.h
+++ b/SVIncCompil/SourceCompile/AntlrParserErrorListener.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   AntlrParserErrorListener.h
  * Author: alain
  *
@@ -26,41 +26,46 @@
 
 namespace SURELOG {
 
-    class AntlrParserErrorListener : public ANTLRErrorListener {
-    public:
+class AntlrParserErrorListener : public ANTLRErrorListener {
+ public:
+  AntlrParserErrorListener(ParseFile *parser, bool watchDogOn,
+                           unsigned int lineOffset, std::string fileName)
+      : m_parser(parser),
+        m_reportedSyntaxError(false),
+        m_watchDogOn(watchDogOn),
+        m_barked(false),
+        m_lineOffset(lineOffset),
+        m_fileName(fileName) {}
 
-        AntlrParserErrorListener(ParseFile* parser, bool watchDogOn, unsigned int lineOffset, std::string fileName) : m_parser(parser), m_reportedSyntaxError(false),
-        m_watchDogOn(watchDogOn), m_barked(false), m_lineOffset(lineOffset), m_fileName(fileName) {
-        }
+  ~AntlrParserErrorListener(){};
 
-        ~AntlrParserErrorListener() {
-        };
+  void syntaxError(Recognizer *recognizer, Token *offendingSymbol, size_t line,
+                   size_t charPositionInLine, const std::string &msg,
+                   std::exception_ptr e);
 
-        void syntaxError(Recognizer *recognizer, Token *offendingSymbol, size_t line,
-                size_t charPositionInLine, const std::string &msg, std::exception_ptr e);
+  void reportAmbiguity(Parser *recognizer, const dfa::DFA &dfa,
+                       size_t startIndex, size_t stopIndex, bool exact,
+                       const antlrcpp::BitSet &ambigAlts,
+                       atn::ATNConfigSet *configs);
 
-        void reportAmbiguity(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex, bool exact,
-                const antlrcpp::BitSet &ambigAlts, atn::ATNConfigSet *configs);
+  void reportAttemptingFullContext(Parser *recognizer, const dfa::DFA &dfa,
+                                   size_t startIndex, size_t stopIndex,
+                                   const antlrcpp::BitSet &conflictingAlts,
+                                   atn::ATNConfigSet *configs);
 
-        void reportAttemptingFullContext(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex,
-                const antlrcpp::BitSet &conflictingAlts, atn::ATNConfigSet *configs);
+  void reportContextSensitivity(Parser *recognizer, const dfa::DFA &dfa,
+                                size_t startIndex, size_t stopIndex,
+                                size_t prediction, atn::ATNConfigSet *configs);
 
-        void reportContextSensitivity(Parser *recognizer, const dfa::DFA &dfa, size_t startIndex, size_t stopIndex,
-                size_t prediction, atn::ATNConfigSet *configs);
-
-        ParseFile* m_parser;
-        bool m_reportedSyntaxError;
-        bool m_watchDogOn;
-        bool m_barked;
-        unsigned int m_lineOffset;
-        std::string m_fileName;
-        std::string m_fileContent;
-    };
-
+  ParseFile *m_parser;
+  bool m_reportedSyntaxError;
+  bool m_watchDogOn;
+  bool m_barked;
+  unsigned int m_lineOffset;
+  std::string m_fileName;
+  std::string m_fileContent;
 };
 
+};  // namespace SURELOG
+
 #endif /* ANTLRPARSERERRORLISTENER_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/AntlrParserHandler.h b/SVIncCompil/SourceCompile/AntlrParserHandler.h
index 0c339d3..5f0f324 100644
--- a/SVIncCompil/SourceCompile/AntlrParserHandler.h
+++ b/SVIncCompil/SourceCompile/AntlrParserHandler.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   AntlrParserHandler.h
  * Author: alain
  *
@@ -24,29 +24,28 @@
 #ifndef ANTLRPARSERHANDLER_H
 #define ANTLRPARSERHANDLER_H
 
-
 namespace SURELOG {
-    
+
 class AntlrParserErrorListener;
 
 class AntlrParserHandler {
-        public:
-            AntlrParserHandler() : m_inputStream(NULL), m_lexer(NULL),
-            m_tokens(NULL), m_parser(NULL), m_tree(NULL), m_errorListener(NULL) {
-            }
-            ~AntlrParserHandler();
-            antlr4::ANTLRInputStream*  m_inputStream;
-            SV3_1aLexer*               m_lexer;
-            antlr4::CommonTokenStream* m_tokens;
-            SV3_1aParser*              m_parser;
-            antlr4::tree::ParseTree*   m_tree;
-            AntlrParserErrorListener*  m_errorListener;
-        };
-
+ public:
+  AntlrParserHandler()
+      : m_inputStream(NULL),
+        m_lexer(NULL),
+        m_tokens(NULL),
+        m_parser(NULL),
+        m_tree(NULL),
+        m_errorListener(NULL) {}
+  ~AntlrParserHandler();
+  antlr4::ANTLRInputStream* m_inputStream;
+  SV3_1aLexer* m_lexer;
+  antlr4::CommonTokenStream* m_tokens;
+  SV3_1aParser* m_parser;
+  antlr4::tree::ParseTree* m_tree;
+  AntlrParserErrorListener* m_errorListener;
 };
 
+};  // namespace SURELOG
+
 #endif /* ANTLRPARSERHANDLER_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/CheckCompile.h b/SVIncCompil/SourceCompile/CheckCompile.h
index 16a011a..2ddc8b2 100644
--- a/SVIncCompil/SourceCompile/CheckCompile.h
+++ b/SVIncCompil/SourceCompile/CheckCompile.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   CheckCompile.h
  * Author: alain
  *
@@ -26,24 +26,21 @@
 
 namespace SURELOG {
 
-class Compiler;    
-    
+class Compiler;
+
 class CheckCompile {
-public:
-    CheckCompile(Compiler* compiler) : m_compiler(compiler) { }
-    bool check();
-    virtual ~CheckCompile();
-private:
-    bool mergeSymbolTables_();
-    
-    bool checkTimescale_();
-    Compiler* m_compiler;
+ public:
+  CheckCompile(Compiler* compiler) : m_compiler(compiler) {}
+  bool check();
+  virtual ~CheckCompile();
+
+ private:
+  bool mergeSymbolTables_();
+
+  bool checkTimescale_();
+  Compiler* m_compiler;
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* CHECKCOMPILE_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/CompilationUnit.h b/SVIncCompil/SourceCompile/CompilationUnit.h
index f00455f..9acd0a8 100644
--- a/SVIncCompil/SourceCompile/CompilationUnit.h
+++ b/SVIncCompil/SourceCompile/CompilationUnit.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   CompilationUnit.h
  * Author: alain
  *
@@ -29,53 +29,52 @@
 namespace SURELOG {
 
 class CompilationUnit {
-public:
-    CompilationUnit(bool fileunit);
-    CompilationUnit(const CompilationUnit& orig);
-    virtual ~CompilationUnit();
-    
-    void setInDesignElement()   { m_inDesignElement = true; }
-    void unsetInDesignElement() { m_inDesignElement = false; }
-    bool isInDesignElement()    { return m_inDesignElement; }
-    bool isFileUnit()           { return m_fileunit; } 
-    
-    void                   registerMacroInfo(const std::string& macroName, MacroInfo* macro);
-    MacroInfo*             getMacroInfo(const std::string& macroName);
+ public:
+  CompilationUnit(bool fileunit);
+  CompilationUnit(const CompilationUnit& orig);
+  virtual ~CompilationUnit();
 
+  void setInDesignElement() { m_inDesignElement = true; }
+  void unsetInDesignElement() { m_inDesignElement = false; }
+  bool isInDesignElement() { return m_inDesignElement; }
+  bool isFileUnit() { return m_fileunit; }
 
-    const MacroStorageRef& getMacros() { return m_macros; }
-    void                   deleteMacro(const std::string& macroName);
-    void                   deleteAllMacros() { m_macros.clear(); }
-    
-    /* Following methods deal with `timescale */
-    void setCurrentTimeInfo(SymbolId fileId);
-    std::vector<TimeInfo>& getTimeInfo() { return m_timeInfo; } 
-    void recordTimeInfo(TimeInfo& info);    
-    TimeInfo& getTimeInfo(SymbolId fileId, unsigned int line);
-    
-    NodeId  generateUniqueDesignElemId() { m_uniqueIdGenerator++; return m_uniqueIdGenerator; }
-    NodeId  generateUniqueNodeId()       { m_uniqueNodeIdGenerator++; return m_uniqueNodeIdGenerator; }
-private:
-    bool m_fileunit;
-    bool m_inDesignElement;
-    
-    MacroStorageRef m_macros;
-    
-    std::vector<TimeInfo> m_timeInfo; 
-    TimeInfo m_noTimeInfo;
-    
-    /* Design Info helper data */
-    NodeId m_uniqueIdGenerator;
-    NodeId m_uniqueNodeIdGenerator;
-    
+  void registerMacroInfo(const std::string& macroName, MacroInfo* macro);
+  MacroInfo* getMacroInfo(const std::string& macroName);
+
+  const MacroStorageRef& getMacros() { return m_macros; }
+  void deleteMacro(const std::string& macroName);
+  void deleteAllMacros() { m_macros.clear(); }
+
+  /* Following methods deal with `timescale */
+  void setCurrentTimeInfo(SymbolId fileId);
+  std::vector<TimeInfo>& getTimeInfo() { return m_timeInfo; }
+  void recordTimeInfo(TimeInfo& info);
+  TimeInfo& getTimeInfo(SymbolId fileId, unsigned int line);
+
+  NodeId generateUniqueDesignElemId() {
+    m_uniqueIdGenerator++;
+    return m_uniqueIdGenerator;
+  }
+  NodeId generateUniqueNodeId() {
+    m_uniqueNodeIdGenerator++;
+    return m_uniqueNodeIdGenerator;
+  }
+
+ private:
+  bool m_fileunit;
+  bool m_inDesignElement;
+
+  MacroStorageRef m_macros;
+
+  std::vector<TimeInfo> m_timeInfo;
+  TimeInfo m_noTimeInfo;
+
+  /* Design Info helper data */
+  NodeId m_uniqueIdGenerator;
+  NodeId m_uniqueNodeIdGenerator;
 };
 
-
-};
-
+};  // namespace SURELOG
 
 #endif /* COMPILATIONUNIT_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/CompileSourceFile.h b/SVIncCompil/SourceCompile/CompileSourceFile.h
index 95702d5..a76d7bb 100644
--- a/SVIncCompil/SourceCompile/CompileSourceFile.h
+++ b/SVIncCompil/SourceCompile/CompileSourceFile.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   CompileSourceFile.h
  * Author: alain
  *
@@ -29,7 +29,6 @@
 #include "ParseFile.h"
 #include "AnalyzeFile.h"
 
-
 namespace SURELOG {
 
 class PreprocessFile;
@@ -38,84 +37,83 @@
 class PythonListen;
 
 class CompileSourceFile {
-public:
-    friend PreprocessFile;
-    typedef enum {
-      Preprocess,
-      PostPreprocess,
-      Parse,
-      PythonAPI      
-    } Action;
-    
-    
-    CompileSourceFile(SymbolId fileId, CommandLineParser* clp, ErrorContainer* errors, Compiler* compiler, 
-                      SymbolTable* symbols, CompilationUnit* comp_unit, Library* library);
+ public:
+  friend PreprocessFile;
+  typedef enum { Preprocess, PostPreprocess, Parse, PythonAPI } Action;
 
-    //Chunk File:
-    CompileSourceFile(CompileSourceFile* parent, SymbolId ppResultFileId, unsigned int lineOffset);
-    
-    bool compile(Action action);
-    CompileSourceFile(const CompileSourceFile& orig);
-    virtual ~CompileSourceFile();
-    Compiler*          getCompiler()          { return m_compiler; }
-    ErrorContainer*    getErrorContainer()    { return m_errors ; }
-    CommandLineParser* getCommandLineParser() { return m_commandLineParser; }
-    SymbolTable*       getSymbolTable()       { return m_symbolTable; }
-    Library*           getLibrary()           { return m_library; }
-    void registerPP(PreprocessFile* pp) { m_ppIncludeVec.push_back(pp); }
-    bool initParser();
-    
-    const std::map<SymbolId, PreprocessFile::AntlrParserHandler*>& getPpAntlrHandlerMap() { return m_antlrPpMap; }
-    void registerAntlrPpHandlerForId(SymbolId id, PreprocessFile::AntlrParserHandler* pp);
-    PreprocessFile::AntlrParserHandler* getAntlrPpHandlerForId(SymbolId);
+  CompileSourceFile(SymbolId fileId, CommandLineParser* clp,
+                    ErrorContainer* errors, Compiler* compiler,
+                    SymbolTable* symbols, CompilationUnit* comp_unit,
+                    Library* library);
 
-    void setPythonInterp(PyThreadState* interpState);
-    void shutdownPythonInterp();
-    PyThreadState* getPythonInterp() { return m_interpState; }
-    
-    void setSymbolTable(SymbolTable* symbols);
-    void setErrorContainer(ErrorContainer* errors) { m_errors = errors ; }
-    
-    unsigned int getJobSize(Action action);
+  // Chunk File:
+  CompileSourceFile(CompileSourceFile* parent, SymbolId ppResultFileId,
+                    unsigned int lineOffset);
 
-    SymbolId getFileId() { return m_fileId; }
-    SymbolId getPpOutputFileId() { return m_ppResultFileId ; }
-    
-    void setFileAnalyzer(AnalyzeFile* analyzer) { m_fileAnalyzer = analyzer; }
-    AnalyzeFile* getFileAnalyzer() { return m_fileAnalyzer; }
-    
-    ParseFile* getParser() { return m_parser; }
-    PreprocessFile* getPreprocessor() { return m_pp; }
-private:
-    bool preprocess_();
-    bool postPreprocess_();
-    
-    bool parse_();
-    
-    bool pythonAPI_();
-    
-    SymbolId m_fileId;
-    CommandLineParser* m_commandLineParser;
-    ErrorContainer* m_errors;
-    Compiler* m_compiler;
-    PreprocessFile* m_pp;
-    SymbolTable*    m_symbolTable;
-    std::vector<PreprocessFile*> m_ppIncludeVec;
-    ParseFile*  m_parser;
-    CompilationUnit* m_compilationUnit;
-    Action      m_action;
-    SymbolId    m_ppResultFileId;
-    std::map<SymbolId, PreprocessFile::AntlrParserHandler*> m_antlrPpMap; //Preprocessor Antlr Handlers (One per included file) 
-    PyThreadState* m_interpState;
-    PythonListen*  m_pythonListener;
-    AnalyzeFile*   m_fileAnalyzer;
-    Library*       m_library;
+  bool compile(Action action);
+  CompileSourceFile(const CompileSourceFile& orig);
+  virtual ~CompileSourceFile();
+  Compiler* getCompiler() { return m_compiler; }
+  ErrorContainer* getErrorContainer() { return m_errors; }
+  CommandLineParser* getCommandLineParser() { return m_commandLineParser; }
+  SymbolTable* getSymbolTable() { return m_symbolTable; }
+  Library* getLibrary() { return m_library; }
+  void registerPP(PreprocessFile* pp) { m_ppIncludeVec.push_back(pp); }
+  bool initParser();
+
+  const std::map<SymbolId, PreprocessFile::AntlrParserHandler*>&
+  getPpAntlrHandlerMap() {
+    return m_antlrPpMap;
+  }
+  void registerAntlrPpHandlerForId(SymbolId id,
+                                   PreprocessFile::AntlrParserHandler* pp);
+  PreprocessFile::AntlrParserHandler* getAntlrPpHandlerForId(SymbolId);
+
+  void setPythonInterp(PyThreadState* interpState);
+  void shutdownPythonInterp();
+  PyThreadState* getPythonInterp() { return m_interpState; }
+
+  void setSymbolTable(SymbolTable* symbols);
+  void setErrorContainer(ErrorContainer* errors) { m_errors = errors; }
+
+  unsigned int getJobSize(Action action);
+
+  SymbolId getFileId() { return m_fileId; }
+  SymbolId getPpOutputFileId() { return m_ppResultFileId; }
+
+  void setFileAnalyzer(AnalyzeFile* analyzer) { m_fileAnalyzer = analyzer; }
+  AnalyzeFile* getFileAnalyzer() { return m_fileAnalyzer; }
+
+  ParseFile* getParser() { return m_parser; }
+  PreprocessFile* getPreprocessor() { return m_pp; }
+
+ private:
+  bool preprocess_();
+  bool postPreprocess_();
+
+  bool parse_();
+
+  bool pythonAPI_();
+
+  SymbolId m_fileId;
+  CommandLineParser* m_commandLineParser;
+  ErrorContainer* m_errors;
+  Compiler* m_compiler;
+  PreprocessFile* m_pp;
+  SymbolTable* m_symbolTable;
+  std::vector<PreprocessFile*> m_ppIncludeVec;
+  ParseFile* m_parser;
+  CompilationUnit* m_compilationUnit;
+  Action m_action;
+  SymbolId m_ppResultFileId;
+  std::map<SymbolId, PreprocessFile::AntlrParserHandler*>
+      m_antlrPpMap;  // Preprocessor Antlr Handlers (One per included file)
+  PyThreadState* m_interpState;
+  PythonListen* m_pythonListener;
+  AnalyzeFile* m_fileAnalyzer;
+  Library* m_library;
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* COMPILESOURCEFILE_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/Compiler.h b/SVIncCompil/SourceCompile/Compiler.h
index 7efdad4..3743070 100644
--- a/SVIncCompil/SourceCompile/Compiler.h
+++ b/SVIncCompil/SourceCompile/Compiler.h
@@ -1,20 +1,20 @@
- /*
- Copyright 2019 Alain Dargelas
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
+/*
+Copyright 2019 Alain Dargelas
 
-/* 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/*
  * File:   Compiler.h
  * Author: alain
  *
@@ -42,64 +42,67 @@
 namespace SURELOG {
 
 class PreprocessFile;
-    
+
 class Compiler {
-public:
-    Compiler(CommandLineParser* commandLineParser, ErrorContainer* errors, SymbolTable* symbolTable);
-    bool compile();
-    Compiler(const Compiler& orig);
-    virtual ~Compiler();
-    CommandLineParser* getCommandLineParser() { return m_commandLineParser; }
-    SymbolTable*       getSymbolTable()       { return m_symbolTable; }
-    ErrorContainer*    getErrorContainer()    { return m_errors; }
-    
-    const std::map<SymbolId, PreprocessFile::AntlrParserHandler*>& getPpAntlrHandlerMap() { return m_antlrPpMap; }
-    void registerAntlrPpHandlerForId(SymbolId id, PreprocessFile::AntlrParserHandler* pp);
-    PreprocessFile::AntlrParserHandler* getAntlrPpHandlerForId(SymbolId);
-    ErrorContainer::Stats getErrorStats();
-    LibrarySet* getLibrarySet() { return m_librarySet; }
-    Design* getDesign() { return m_design; }
-    bool isLibraryFile(SymbolId id);
-    
-#ifdef USETBB    
-    tbb::task_group& getTaskGroup() { return m_taskGroup; }
-#endif
-    
-private:
-    bool parseLibrariesDef_();
-    
-    bool ppinit_();
-    bool parseinit_();
-    bool pythoninit_();
-    bool compileFileSet_(CompileSourceFile::Action action, bool allowMultithread, std::vector<CompileSourceFile*>& container);
-    bool compileOneFile_(CompileSourceFile* compileSource, CompileSourceFile::Action action);
-    bool cleanup_();
-    
-    CommandLineParser* m_commandLineParser;
-    ErrorContainer* m_errors;
-    SymbolTable* m_symbolTable;
-    CompilationUnit* m_commonCompilationUnit;
-    std::map<SymbolId, PreprocessFile::AntlrParserHandler*> m_antlrPpMap;
-    std::vector<CompileSourceFile*> m_compilers;
-    std::vector<CompileSourceFile*> m_compilersChunkFiles;
-    std::vector<CompileSourceFile*> m_compilersParentFiles;
-    std::vector<CompilationUnit*>   m_compilationUnits;
-    std::vector<SymbolTable*>       m_symbolTables;
-    std::vector<ErrorContainer*>    m_errorContainers;
-    LibrarySet*                     m_librarySet;
-    ConfigSet*                      m_configSet;
-    Design*                         m_design;
-    std::set<SymbolId>              m_libraryFiles; // -v <file>
+ public:
+  Compiler(CommandLineParser* commandLineParser, ErrorContainer* errors,
+           SymbolTable* symbolTable);
+  bool compile();
+  Compiler(const Compiler& orig);
+  virtual ~Compiler();
+  CommandLineParser* getCommandLineParser() { return m_commandLineParser; }
+  SymbolTable* getSymbolTable() { return m_symbolTable; }
+  ErrorContainer* getErrorContainer() { return m_errors; }
+
+  const std::map<SymbolId, PreprocessFile::AntlrParserHandler*>&
+  getPpAntlrHandlerMap() {
+    return m_antlrPpMap;
+  }
+  void registerAntlrPpHandlerForId(SymbolId id,
+                                   PreprocessFile::AntlrParserHandler* pp);
+  PreprocessFile::AntlrParserHandler* getAntlrPpHandlerForId(SymbolId);
+  ErrorContainer::Stats getErrorStats();
+  LibrarySet* getLibrarySet() { return m_librarySet; }
+  Design* getDesign() { return m_design; }
+  bool isLibraryFile(SymbolId id);
 
 #ifdef USETBB
-    tbb::task_group                 m_taskGroup;
+  tbb::task_group& getTaskGroup() { return m_taskGroup; }
+#endif
+
+ private:
+  bool parseLibrariesDef_();
+
+  bool ppinit_();
+  bool parseinit_();
+  bool pythoninit_();
+  bool compileFileSet_(CompileSourceFile::Action action, bool allowMultithread,
+                       std::vector<CompileSourceFile*>& container);
+  bool compileOneFile_(CompileSourceFile* compileSource,
+                       CompileSourceFile::Action action);
+  bool cleanup_();
+
+  CommandLineParser* m_commandLineParser;
+  ErrorContainer* m_errors;
+  SymbolTable* m_symbolTable;
+  CompilationUnit* m_commonCompilationUnit;
+  std::map<SymbolId, PreprocessFile::AntlrParserHandler*> m_antlrPpMap;
+  std::vector<CompileSourceFile*> m_compilers;
+  std::vector<CompileSourceFile*> m_compilersChunkFiles;
+  std::vector<CompileSourceFile*> m_compilersParentFiles;
+  std::vector<CompilationUnit*> m_compilationUnits;
+  std::vector<SymbolTable*> m_symbolTables;
+  std::vector<ErrorContainer*> m_errorContainers;
+  LibrarySet* m_librarySet;
+  ConfigSet* m_configSet;
+  Design* m_design;
+  std::set<SymbolId> m_libraryFiles;  // -v <file>
+
+#ifdef USETBB
+  tbb::task_group m_taskGroup;
 #endif
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* COMPILER_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/IncludeFileInfo.h b/SVIncCompil/SourceCompile/IncludeFileInfo.h
index 5c9c58c..306bd86 100644
--- a/SVIncCompil/SourceCompile/IncludeFileInfo.h
+++ b/SVIncCompil/SourceCompile/IncludeFileInfo.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   IncludeFileInfo.h
  * Author: alain
  *
@@ -24,31 +24,40 @@
 #ifndef INCLUDEFILEINFO_H
 #define INCLUDEFILEINFO_H
 
-
 namespace SURELOG {
 
-    class IncludeFileInfo {  
-    public:
-        IncludeFileInfo() : m_sectionStartLine(0), m_sectionFile(0), m_originalLine(0), m_type(0),
-               m_indexOpening(-1), m_indexClosing(-1) {}
-        IncludeFileInfo(unsigned int sectionStartLine, SymbolId sectionFile, unsigned int originalLine, unsigned int type) : 
-               m_sectionStartLine(sectionStartLine), m_sectionFile(sectionFile), m_originalLine(originalLine), m_type(type),
-               m_indexOpening(-1), m_indexClosing(-1) {}
-        IncludeFileInfo(const IncludeFileInfo& i) : m_sectionStartLine(i.m_sectionStartLine), 
-              m_sectionFile(i.m_sectionFile), m_originalLine(i.m_originalLine), m_type(i.m_type),
-               m_indexOpening(i.m_indexOpening), m_indexClosing(i.m_indexClosing)  {}
-        unsigned int m_sectionStartLine; 
-        SymbolId     m_sectionFile;
-        unsigned int m_originalLine;
-        unsigned int m_type; // 1 or 2, push or pop
-        int m_indexOpening;
-        int m_indexClosing;
-    };
-
+class IncludeFileInfo {
+ public:
+  IncludeFileInfo()
+      : m_sectionStartLine(0),
+        m_sectionFile(0),
+        m_originalLine(0),
+        m_type(0),
+        m_indexOpening(-1),
+        m_indexClosing(-1) {}
+  IncludeFileInfo(unsigned int sectionStartLine, SymbolId sectionFile,
+                  unsigned int originalLine, unsigned int type)
+      : m_sectionStartLine(sectionStartLine),
+        m_sectionFile(sectionFile),
+        m_originalLine(originalLine),
+        m_type(type),
+        m_indexOpening(-1),
+        m_indexClosing(-1) {}
+  IncludeFileInfo(const IncludeFileInfo& i)
+      : m_sectionStartLine(i.m_sectionStartLine),
+        m_sectionFile(i.m_sectionFile),
+        m_originalLine(i.m_originalLine),
+        m_type(i.m_type),
+        m_indexOpening(i.m_indexOpening),
+        m_indexClosing(i.m_indexClosing) {}
+  unsigned int m_sectionStartLine;
+  SymbolId m_sectionFile;
+  unsigned int m_originalLine;
+  unsigned int m_type;  // 1 or 2, push or pop
+  int m_indexOpening;
+  int m_indexClosing;
 };
 
+};  // namespace SURELOG
+
 #endif /* INCLUDEFILEINFO_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/LoopCheck.h b/SVIncCompil/SourceCompile/LoopCheck.h
index b6462e1..aca6930 100644
--- a/SVIncCompil/SourceCompile/LoopCheck.h
+++ b/SVIncCompil/SourceCompile/LoopCheck.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   LoopCheck.h
  * Author: alain
  *
@@ -24,38 +24,33 @@
 #ifndef LOOPCHECK_H
 #define LOOPCHECK_H
 
-
 namespace SURELOG {
 
 class LoopCheck {
-public:
-    LoopCheck();
-    LoopCheck(const LoopCheck& orig);
-    virtual ~LoopCheck();
-    
-    void clear();
-    
-    // return true if new edge creates a loop
-    bool addEdge(SymbolId from, SymbolId to);
-    
-    std::vector<SymbolId> reportLoop();
-    
-private:
-   class Node {
+ public:
+  LoopCheck();
+  LoopCheck(const LoopCheck& orig);
+  virtual ~LoopCheck();
+
+  void clear();
+
+  // return true if new edge creates a loop
+  bool addEdge(SymbolId from, SymbolId to);
+
+  std::vector<SymbolId> reportLoop();
+
+ private:
+  class Node {
    public:
-        Node (SymbolId objId) : m_objId(objId), m_visited(false) {}
-        SymbolId m_objId;
-        std::set<Node*> m_toList; 
-        bool m_visited;
-    };
-    
-    std::map<SymbolId, Node*> m_nodes;
+    Node(SymbolId objId) : m_objId(objId), m_visited(false) {}
+    SymbolId m_objId;
+    std::set<Node*> m_toList;
+    bool m_visited;
+  };
+
+  std::map<SymbolId, Node*> m_nodes;
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* LOOPCHECK_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/MacroInfo.h b/SVIncCompil/SourceCompile/MacroInfo.h
index b8bbf40..6a123bd 100644
--- a/SVIncCompil/SourceCompile/MacroInfo.h
+++ b/SVIncCompil/SourceCompile/MacroInfo.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   MacroInfo.h
  * Author: alain
  *
@@ -28,34 +28,36 @@
 #include <vector>
 #include <map>
 namespace SURELOG {
-    
- class MacroInfo {
-    public:
-        MacroInfo(std::string name, int type, SymbolId file, unsigned int line, unsigned short int column, 
-                  const std::vector<std::string>& arguments,const std::vector<std::string>& tokens) 
-        : m_name(name), m_type(type), m_file(file), m_line(line), m_column(column), m_arguments(arguments), m_tokens(tokens) {}
-        enum Type {
-            NO_ARGS,
-            WITH_ARGS,
-        };
-        std::string              m_name;
-        int                      m_type;
-        SymbolId                 m_file;
-        unsigned int             m_line;
-        unsigned short int       m_column;
-        std::vector<std::string> m_arguments;
-        std::vector<std::string> m_tokens;
-    };
-  
-  typedef std::map<std::string,MacroInfo*> MacroStorage;
-  typedef std::map<std::string,MacroInfo*> MacroStorageRef;  
-  
-    
-    
+
+class MacroInfo {
+ public:
+  MacroInfo(std::string name, int type, SymbolId file, unsigned int line,
+            unsigned short int column,
+            const std::vector<std::string>& arguments,
+            const std::vector<std::string>& tokens)
+      : m_name(name),
+        m_type(type),
+        m_file(file),
+        m_line(line),
+        m_column(column),
+        m_arguments(arguments),
+        m_tokens(tokens) {}
+  enum Type {
+    NO_ARGS,
+    WITH_ARGS,
+  };
+  std::string m_name;
+  int m_type;
+  SymbolId m_file;
+  unsigned int m_line;
+  unsigned short int m_column;
+  std::vector<std::string> m_arguments;
+  std::vector<std::string> m_tokens;
 };
 
+typedef std::map<std::string, MacroInfo*> MacroStorage;
+typedef std::map<std::string, MacroInfo*> MacroStorageRef;
+
+};  // namespace SURELOG
+
 #endif /* MACROINFO_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/ParseFile.h b/SVIncCompil/SourceCompile/ParseFile.h
index 53ae4cf..9a959fa 100644
--- a/SVIncCompil/SourceCompile/ParseFile.h
+++ b/SVIncCompil/SourceCompile/ParseFile.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   ParseFile.h
  * Author: alain
  *
@@ -37,85 +37,90 @@
 class AntlrParserErrorListener;
 
 class ParseFile {
-public:
-    friend class PythonListen;
-    
-    // Helper constructor used by SVLibShapeListener
-    ParseFile(SymbolId fileId, SymbolTable* symbolTable, ErrorContainer* errors);
-    
-    // Regular file
-    ParseFile(SymbolId fileId, CompileSourceFile* csf, CompilationUnit* compilationUnit, Library* library, SymbolId ppFileId, bool keepParserHandler);
-    
-    // File chunk
-    ParseFile(CompileSourceFile* compileSourceFile, ParseFile* parent, SymbolId chunkFileId, unsigned int offsetLine);
-    
-    bool parse();
-    
-    virtual ~ParseFile();
-    bool needToParse();
-    CompileSourceFile* getCompileSourceFile() { return m_compileSourceFile; }
-    CompilationUnit*   getCompilationUnit() { return m_compilationUnit; }
-    Library*           getLibrary() { return m_library; }
-    const std::string getFileName(unsigned int line);
-    const std::string getPpFileName() { return getSymbol(m_ppFileId); } 
-    SymbolTable* getSymbolTable();
-    ErrorContainer* getErrorContainer();
-    SymbolId getFileId(unsigned int line);
-    SymbolId getRawFileId() { return m_fileId; }
-    SymbolId getPpFileId() { return m_ppFileId; }
-    unsigned int getLineNb(unsigned int line);
-    
-    class LineTranslationInfo {
-    public:
-       LineTranslationInfo(SymbolId pretendFileId, unsigned int originalLine,  unsigned int pretendLine) : 
-            m_pretendFileId(pretendFileId), m_originalLine(originalLine), m_pretendLine(pretendLine) {}
-       SymbolId           m_pretendFileId;
-       unsigned int m_originalLine;
-       unsigned int m_pretendLine;
-    };
-    
-    AntlrParserHandler* getAntlrParserHandler() { return m_antlrParserHandler; }   
-        
-    void addLineTranslationInfo(LineTranslationInfo& info) { m_lineTranslationVec.push_back(info); }
-    
-    void addError (Error& error);
-    SymbolId registerSymbol(const std::string symbol);
-    SymbolId getId(const std::string symbol);
-    const std::string getSymbol(SymbolId id);
-    bool usingCachedVersion() { return m_usingCachedVersion; }
-    FileContent* getFileContent() { return m_fileContent; }
-    void setFileContent( FileContent* content) { m_fileContent = content;} 
-    void setDebugAstModel() { debug_AstModel = true; }
-    std::string getProfileInfo();  
-private:
-    SymbolId m_fileId;
-    SymbolId m_ppFileId;
-    CompileSourceFile* m_compileSourceFile;
-    CompilationUnit*   m_compilationUnit;    
-    Library*           m_library;
-    AntlrParserHandler*              m_antlrParserHandler;
-    SV3_1aTreeShapeListener*         m_listener;
-    std::vector<LineTranslationInfo> m_lineTranslationVec;
-    bool m_usingCachedVersion;
-    bool m_keepParserHandler;
-    FileContent*                          m_fileContent;
-    bool debug_AstModel;
-  
-    bool parseOneFile_ (std::string fileName, unsigned int lineOffset);
-    
-    // For file chunk:
-    std::vector<ParseFile*>               m_children;
-    ParseFile*                            m_parent;
-    unsigned int                          m_offsetLine;
-    SymbolTable*                          m_symbolTable;
-    ErrorContainer*                       m_errors;
-    std::string                           m_profileInfo;
+ public:
+  friend class PythonListen;
+
+  // Helper constructor used by SVLibShapeListener
+  ParseFile(SymbolId fileId, SymbolTable* symbolTable, ErrorContainer* errors);
+
+  // Regular file
+  ParseFile(SymbolId fileId, CompileSourceFile* csf,
+            CompilationUnit* compilationUnit, Library* library,
+            SymbolId ppFileId, bool keepParserHandler);
+
+  // File chunk
+  ParseFile(CompileSourceFile* compileSourceFile, ParseFile* parent,
+            SymbolId chunkFileId, unsigned int offsetLine);
+
+  bool parse();
+
+  virtual ~ParseFile();
+  bool needToParse();
+  CompileSourceFile* getCompileSourceFile() { return m_compileSourceFile; }
+  CompilationUnit* getCompilationUnit() { return m_compilationUnit; }
+  Library* getLibrary() { return m_library; }
+  const std::string getFileName(unsigned int line);
+  const std::string getPpFileName() { return getSymbol(m_ppFileId); }
+  SymbolTable* getSymbolTable();
+  ErrorContainer* getErrorContainer();
+  SymbolId getFileId(unsigned int line);
+  SymbolId getRawFileId() { return m_fileId; }
+  SymbolId getPpFileId() { return m_ppFileId; }
+  unsigned int getLineNb(unsigned int line);
+
+  class LineTranslationInfo {
+   public:
+    LineTranslationInfo(SymbolId pretendFileId, unsigned int originalLine,
+                        unsigned int pretendLine)
+        : m_pretendFileId(pretendFileId),
+          m_originalLine(originalLine),
+          m_pretendLine(pretendLine) {}
+    SymbolId m_pretendFileId;
+    unsigned int m_originalLine;
+    unsigned int m_pretendLine;
+  };
+
+  AntlrParserHandler* getAntlrParserHandler() { return m_antlrParserHandler; }
+
+  void addLineTranslationInfo(LineTranslationInfo& info) {
+    m_lineTranslationVec.push_back(info);
+  }
+
+  void addError(Error& error);
+  SymbolId registerSymbol(const std::string symbol);
+  SymbolId getId(const std::string symbol);
+  const std::string getSymbol(SymbolId id);
+  bool usingCachedVersion() { return m_usingCachedVersion; }
+  FileContent* getFileContent() { return m_fileContent; }
+  void setFileContent(FileContent* content) { m_fileContent = content; }
+  void setDebugAstModel() { debug_AstModel = true; }
+  std::string getProfileInfo();
+
+ private:
+  SymbolId m_fileId;
+  SymbolId m_ppFileId;
+  CompileSourceFile* m_compileSourceFile;
+  CompilationUnit* m_compilationUnit;
+  Library* m_library;
+  AntlrParserHandler* m_antlrParserHandler;
+  SV3_1aTreeShapeListener* m_listener;
+  std::vector<LineTranslationInfo> m_lineTranslationVec;
+  bool m_usingCachedVersion;
+  bool m_keepParserHandler;
+  FileContent* m_fileContent;
+  bool debug_AstModel;
+
+  bool parseOneFile_(std::string fileName, unsigned int lineOffset);
+
+  // For file chunk:
+  std::vector<ParseFile*> m_children;
+  ParseFile* m_parent;
+  unsigned int m_offsetLine;
+  SymbolTable* m_symbolTable;
+  ErrorContainer* m_errors;
+  std::string m_profileInfo;
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* PARSEFILE_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/PreprocessFile.h b/SVIncCompil/SourceCompile/PreprocessFile.h
index 4b51fad..e45f6c6 100644
--- a/SVIncCompil/SourceCompile/PreprocessFile.h
+++ b/SVIncCompil/SourceCompile/PreprocessFile.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   PreprocessFile.h
  * Author: alain
  *
@@ -45,224 +45,268 @@
 
 /* Can be either an include file or a macro definition being evaluated */
 class PreprocessFile {
-public:  
-    class SpecialInstructions;      
-    class DescriptiveErrorListener;
-    
-    /* Constructors */
-    PreprocessFile(SymbolId fileId, CompileSourceFile* csf, SpecialInstructions& instructions, 
-                   CompilationUnit* compilationUnit, Library* library);
-    PreprocessFile(SymbolId fileId, PreprocessFile* includedIn, unsigned int includerLine, CompileSourceFile* csf, 
-                   SpecialInstructions& instructions, CompilationUnit* compilationUnit, Library* library, 
-                   std::string macroBody = "", MacroInfo* = NULL,
-                   unsigned int embeddedMacroCallLine = 0, SymbolId embeddedMacroCallFile = 0);
-    PreprocessFile(const PreprocessFile& orig);
-    virtual ~PreprocessFile();
-    
-    /* Main function */
-    bool preprocess();
-    std::string getPreProcessedFileContent();    
-    
-     /* Macro manipulations */
-    void        recordMacro(const std::string name, unsigned int line, unsigned short int column, 
-                     const std::string formal_arguments, const std::vector<std::string> body);
-    void        recordMacro(const std::string name, unsigned int line, unsigned short int column, 
-                     const std::vector<std::string> formal_arguments, const std::vector<std::string> body);
-    std::string getMacro(const std::string name,std::vector<std::string>& actual_arguments, PreprocessFile* callingFile, 
-                         unsigned int callingLine, LoopCheck& loopChecker, SpecialInstructions& instructions, 
-                         unsigned int embeddedMacroCallLine = 0, SymbolId embeddedMacroCallFile = 0);
-    bool        deleteMacro(const std::string name, std::set<PreprocessFile*>& visited);
-    void        undefineAllMacros(std::set<PreprocessFile*>& visited);
-    bool        isMacroBody() { return (m_macroBody != ""); }
-    std::string getMacroBody() { return m_macroBody; }
-    MacroInfo*  getMacroInfo() { return m_macroInfo; }
-    SymbolId    getMacroSignature();
-    const MacroStorage&       getMacros() { return m_macros; }    
-    MacroInfo* getMacro(const std::string name);
-    
-    const std::string getFileName(unsigned int line);
+ public:
+  class SpecialInstructions;
+  class DescriptiveErrorListener;
 
-    std::string reportIncludeInfo();
-    
-    CompileSourceFile* getCompileSourceFile() { return m_compileSourceFile; }
-    CompilationUnit*   getCompilationUnit() { return m_compilationUnit; }
-    Library* getLibrary() { return m_library; }
-    antlr4::CommonTokenStream* getTokenStream() { return m_antlrParserHandler ? m_antlrParserHandler->m_pptokens : NULL; }
-    
-    SymbolId getFileId(unsigned int line);
-    SymbolId getIncluderFileId(unsigned int line);
-    SymbolId getRawFileId() { return m_fileId; }
-    unsigned int getLineNb(unsigned int line);
-    PreprocessFile* getIncluder() { return m_includer; }
-    unsigned int getIncluderLine() { return m_includerLine; }
-    unsigned int  getLineCount() { return m_lineCount; }
-    unsigned int  getSumLineCount();
-    std::vector<IncludeFileInfo>& getIncludeFileInfo() { return m_includeFileInfo; }
-    IncludeFileInfo& getIncludeFileInfo(int index) { 
-             if (index >=0 && index < ((int) m_includeFileInfo.size()))
-                 return m_includeFileInfo[index];
-             else return m_badIncludeFileInfo;
-    }
-    unsigned int getEmbeddedMacroCallLine() { return m_embeddedMacroCallLine; }
-    SymbolId     getEmbeddedMacroCallFile() { return m_embeddedMacroCallFile; }
-    
-    /* Markings */
-    static std::string MacroNotDefined;
-    static std::string PP__Line__Marking;
-    static std::string PP__File__Marking;
-    
-private:
-    SymbolId m_fileId;
-    Library* m_library;
-    std::string m_result;
-    std::string m_macroBody;
-    PreprocessFile* m_includer;
-    unsigned int  m_includerLine;
-    std::vector<PreprocessFile*> m_includes;
-    CompileSourceFile* m_compileSourceFile;
-    unsigned int m_lineCount;
-    IncludeFileInfo m_badIncludeFileInfo;
-public: 
-    
-    /* Instructions passed from calling scope */
-    class SpecialInstructions {
-    public:
-        enum TraceInstr        : bool { Mute      = true, DontMute      = false };
-        enum EmptyMacroInstr   : bool { Mark      = true, DontMark      = false };
-        enum FileLineInfoInstr : bool { Filter    = true, DontFilter    = false };
-        enum CheckLoopInstr    : bool { CheckLoop = true, DontCheckLoop = false };
-        enum AsIsUndefinedMacroInstr : bool { AsIsUndefinedMacro = true, ComplainUndefinedMacro = false };
-        SpecialInstructions () : m_mute(DontMute), m_mark_empty_macro(DontMark), m_filterFileLine(DontFilter), 
-                                 m_check_macro_loop(DontCheckLoop), m_as_is_undefined_macro(ComplainUndefinedMacro) {}
-        SpecialInstructions (SpecialInstructions& rhs) : m_mute(rhs.m_mute), m_mark_empty_macro(rhs.m_mark_empty_macro), 
-                             m_filterFileLine(rhs.m_filterFileLine), m_check_macro_loop(rhs.m_check_macro_loop), 
-                             m_as_is_undefined_macro(rhs.m_as_is_undefined_macro) {}
-        SpecialInstructions (TraceInstr mute, EmptyMacroInstr mark_empty_macro, FileLineInfoInstr filterFileLine, 
-                             CheckLoopInstr check_macro_loop, AsIsUndefinedMacroInstr as_is_undefined_macro) : m_mute(mute), 
-                             m_mark_empty_macro(mark_empty_macro), m_filterFileLine(filterFileLine), 
-                             m_check_macro_loop(check_macro_loop), m_as_is_undefined_macro(as_is_undefined_macro) {}
-        void print() { std::cout << "Trace:" << (m_mute ? "Mute" : "DontMute") << 
-                             ", EmptyMacro:" << (m_mark_empty_macro ? "Mark" : "DontMark") << 
-                             ", FileLineInfo:" << (m_filterFileLine ? "Filter " : "DontFilter") <<
-                             ", CheckLoop:" << (m_check_macro_loop ? "CheckLoop" : "DontCheckLoop") <<
-                             ", AsIsUndefMacro:" << ( m_as_is_undefined_macro ? "AsIsUndefinedMacro" : "ComplainUndefinedMacro")
-                              <<  std::endl;
-                     };
-        TraceInstr m_mute;
-        EmptyMacroInstr m_mark_empty_macro;
-        FileLineInfoInstr m_filterFileLine;
-        CheckLoopInstr m_check_macro_loop;
-        AsIsUndefinedMacroInstr m_as_is_undefined_macro;
-    };
-      
-    std::string evaluateMacroInstance(const std::string macro_instance, PreprocessFile* callingFile, unsigned int callingLine, 
-                                      SpecialInstructions::CheckLoopInstr checkMacroLoop, SpecialInstructions::AsIsUndefinedMacroInstr);
-    
-    
-    /* Incoming `line handling */
-    class LineTranslationInfo {
-    public:
-       LineTranslationInfo(SymbolId pretendFileId, unsigned int originalLine, unsigned int pretendLine) : 
-            m_pretendFileId(pretendFileId), m_originalLine(originalLine), m_pretendLine(pretendLine) {}
-       SymbolId           m_pretendFileId;
-       unsigned int m_originalLine;
-       unsigned int m_pretendLine;
-    };
-    
-    /* `ifdef, `ifndef, `elsif, `else Stack */
-    class IfElseItem {
-    public:
-        enum Type {
-            IFDEF, IFNDEF, ELSIF, ELSE
-        };
-        std::string m_macroName;
-        bool m_defined;
-        Type m_type;
-        bool m_previousActiveState;
-    };
-    typedef std::vector<IfElseItem> IfElseStack;
-    IfElseStack m_ifStack;    
-    IfElseStack& getStack();
-    
-    /* Antlr parser container */
-    class AntlrParserHandler {
-        public:
-            AntlrParserHandler() : m_inputStream(NULL), m_pplexer(NULL),
-            m_pptokens(NULL), m_ppparser(NULL), m_pptree(NULL) {
-            }
-            ~AntlrParserHandler();
-            antlr4::ANTLRInputStream*  m_inputStream;
-            SV3_1aPpLexer*             m_pplexer;
-            antlr4::CommonTokenStream* m_pptokens;
-            SV3_1aPpParser*            m_ppparser;
-            antlr4::tree::ParseTree*   m_pptree;
-            DescriptiveErrorListener*  m_errorListener;
-        };
-    SV3_1aPpTreeShapeListener*         m_listener;
-    
-public:  
-    /* Options */
-    void setDebug(int level);
-    bool m_debugPP;
-    bool m_debugPPResult;
-    bool m_debugPPTokens;
-    bool m_debugPPTree;
-    bool m_debugMacro;
-    
-    SpecialInstructions m_instructions;
+  /* Constructors */
+  PreprocessFile(SymbolId fileId, CompileSourceFile* csf,
+                 SpecialInstructions& instructions,
+                 CompilationUnit* compilationUnit, Library* library);
+  PreprocessFile(SymbolId fileId, PreprocessFile* includedIn,
+                 unsigned int includerLine, CompileSourceFile* csf,
+                 SpecialInstructions& instructions,
+                 CompilationUnit* compilationUnit, Library* library,
+                 std::string macroBody = "", MacroInfo* = NULL,
+                 unsigned int embeddedMacroCallLine = 0,
+                 SymbolId embeddedMacroCallFile = 0);
+  PreprocessFile(const PreprocessFile& orig);
+  virtual ~PreprocessFile();
 
-    /* To create the preprocessed content */
-    void append(const std::string& s);
-    void pauseAppend() { m_pauseAppend = true; }
-    void resumeAppend() { m_pauseAppend = false; }
-     
-    void addLineTranslationInfo(LineTranslationInfo& info) { m_lineTranslationVec.push_back(info); }
-    
-    /* Shorthand for logging an error */
-    void addError (Error& error);
-    
-    /* Shorthands for symbol manipulations */
-    SymbolId registerSymbol(const std::string symbol);
-    SymbolId getId(const std::string symbol);
-    const std::string getSymbol(SymbolId id);
-    
-    // For recursive macro definition detection
-    PreprocessFile* getSourceFile();
-    LoopCheck m_loopChecker;
-    
-    // For cache processing
-    void saveCache();
-    void collectIncludedFiles(std::set<PreprocessFile*>& included);
-    bool usingCachedVersion() { return m_usingCachedVersion; }
+  /* Main function */
+  bool preprocess();
+  std::string getPreProcessedFileContent();
 
-private:
-   
-    std::pair<bool, std::string> evaluateMacro_ (const std::string name, std::vector<std::string>& arguments, PreprocessFile* callingFile, 
-                                                 unsigned int callingLine, LoopCheck& loopChecker, 
-                                                 MacroInfo* macroInfo, SpecialInstructions& instructions,
-                                                 unsigned int embeddedMacroCallLine, SymbolId embeddedMacroCallFile);
-    
-    void checkMacroArguments_(const std::string& name, unsigned int line, unsigned short column, 
-                              const std::vector<std::string>& arguments, const std::vector<std::string>& tokens);
-    void forgetPreprocessor_(PreprocessFile*, PreprocessFile* pp);
-    AntlrParserHandler* m_antlrParserHandler;
-    
-    MacroInfo*       m_macroInfo;   /* Only used when preprocessing a macro content */
-    MacroStorage     m_macros;
-    
-    CompilationUnit* m_compilationUnit;       
-    std::vector<LineTranslationInfo> m_lineTranslationVec;
-    bool m_pauseAppend;
-    bool m_usingCachedVersion;
-    std::vector<IncludeFileInfo> m_includeFileInfo;
-    unsigned int m_embeddedMacroCallLine;
-    SymbolId m_embeddedMacroCallFile;
+  /* Macro manipulations */
+  void recordMacro(const std::string name, unsigned int line,
+                   unsigned short int column,
+                   const std::string formal_arguments,
+                   const std::vector<std::string> body);
+  void recordMacro(const std::string name, unsigned int line,
+                   unsigned short int column,
+                   const std::vector<std::string> formal_arguments,
+                   const std::vector<std::string> body);
+  std::string getMacro(const std::string name,
+                       std::vector<std::string>& actual_arguments,
+                       PreprocessFile* callingFile, unsigned int callingLine,
+                       LoopCheck& loopChecker,
+                       SpecialInstructions& instructions,
+                       unsigned int embeddedMacroCallLine = 0,
+                       SymbolId embeddedMacroCallFile = 0);
+  bool deleteMacro(const std::string name, std::set<PreprocessFile*>& visited);
+  void undefineAllMacros(std::set<PreprocessFile*>& visited);
+  bool isMacroBody() { return (m_macroBody != ""); }
+  std::string getMacroBody() { return m_macroBody; }
+  MacroInfo* getMacroInfo() { return m_macroInfo; }
+  SymbolId getMacroSignature();
+  const MacroStorage& getMacros() { return m_macros; }
+  MacroInfo* getMacro(const std::string name);
+
+  const std::string getFileName(unsigned int line);
+
+  std::string reportIncludeInfo();
+
+  CompileSourceFile* getCompileSourceFile() { return m_compileSourceFile; }
+  CompilationUnit* getCompilationUnit() { return m_compilationUnit; }
+  Library* getLibrary() { return m_library; }
+  antlr4::CommonTokenStream* getTokenStream() {
+    return m_antlrParserHandler ? m_antlrParserHandler->m_pptokens : NULL;
+  }
+
+  SymbolId getFileId(unsigned int line);
+  SymbolId getIncluderFileId(unsigned int line);
+  SymbolId getRawFileId() { return m_fileId; }
+  unsigned int getLineNb(unsigned int line);
+  PreprocessFile* getIncluder() { return m_includer; }
+  unsigned int getIncluderLine() { return m_includerLine; }
+  unsigned int getLineCount() { return m_lineCount; }
+  unsigned int getSumLineCount();
+  std::vector<IncludeFileInfo>& getIncludeFileInfo() {
+    return m_includeFileInfo;
+  }
+  IncludeFileInfo& getIncludeFileInfo(int index) {
+    if (index >= 0 && index < ((int)m_includeFileInfo.size()))
+      return m_includeFileInfo[index];
+    else
+      return m_badIncludeFileInfo;
+  }
+  unsigned int getEmbeddedMacroCallLine() { return m_embeddedMacroCallLine; }
+  SymbolId getEmbeddedMacroCallFile() { return m_embeddedMacroCallFile; }
+
+  /* Markings */
+  static std::string MacroNotDefined;
+  static std::string PP__Line__Marking;
+  static std::string PP__File__Marking;
+
+ private:
+  SymbolId m_fileId;
+  Library* m_library;
+  std::string m_result;
+  std::string m_macroBody;
+  PreprocessFile* m_includer;
+  unsigned int m_includerLine;
+  std::vector<PreprocessFile*> m_includes;
+  CompileSourceFile* m_compileSourceFile;
+  unsigned int m_lineCount;
+  IncludeFileInfo m_badIncludeFileInfo;
+
+ public:
+  /* Instructions passed from calling scope */
+  class SpecialInstructions {
+   public:
+    enum TraceInstr : bool { Mute = true, DontMute = false };
+    enum EmptyMacroInstr : bool { Mark = true, DontMark = false };
+    enum FileLineInfoInstr : bool { Filter = true, DontFilter = false };
+    enum CheckLoopInstr : bool { CheckLoop = true, DontCheckLoop = false };
+    enum AsIsUndefinedMacroInstr : bool {
+      AsIsUndefinedMacro = true,
+      ComplainUndefinedMacro = false
+    };
+    SpecialInstructions()
+        : m_mute(DontMute),
+          m_mark_empty_macro(DontMark),
+          m_filterFileLine(DontFilter),
+          m_check_macro_loop(DontCheckLoop),
+          m_as_is_undefined_macro(ComplainUndefinedMacro) {}
+    SpecialInstructions(SpecialInstructions& rhs)
+        : m_mute(rhs.m_mute),
+          m_mark_empty_macro(rhs.m_mark_empty_macro),
+          m_filterFileLine(rhs.m_filterFileLine),
+          m_check_macro_loop(rhs.m_check_macro_loop),
+          m_as_is_undefined_macro(rhs.m_as_is_undefined_macro) {}
+    SpecialInstructions(TraceInstr mute, EmptyMacroInstr mark_empty_macro,
+                        FileLineInfoInstr filterFileLine,
+                        CheckLoopInstr check_macro_loop,
+                        AsIsUndefinedMacroInstr as_is_undefined_macro)
+        : m_mute(mute),
+          m_mark_empty_macro(mark_empty_macro),
+          m_filterFileLine(filterFileLine),
+          m_check_macro_loop(check_macro_loop),
+          m_as_is_undefined_macro(as_is_undefined_macro) {}
+    void print() {
+      std::cout << "Trace:" << (m_mute ? "Mute" : "DontMute")
+                << ", EmptyMacro:" << (m_mark_empty_macro ? "Mark" : "DontMark")
+                << ", FileLineInfo:"
+                << (m_filterFileLine ? "Filter " : "DontFilter")
+                << ", CheckLoop:"
+                << (m_check_macro_loop ? "CheckLoop" : "DontCheckLoop")
+                << ", AsIsUndefMacro:"
+                << (m_as_is_undefined_macro ? "AsIsUndefinedMacro"
+                                            : "ComplainUndefinedMacro")
+                << std::endl;
+    };
+    TraceInstr m_mute;
+    EmptyMacroInstr m_mark_empty_macro;
+    FileLineInfoInstr m_filterFileLine;
+    CheckLoopInstr m_check_macro_loop;
+    AsIsUndefinedMacroInstr m_as_is_undefined_macro;
+  };
+
+  std::string evaluateMacroInstance(
+      const std::string macro_instance, PreprocessFile* callingFile,
+      unsigned int callingLine,
+      SpecialInstructions::CheckLoopInstr checkMacroLoop,
+      SpecialInstructions::AsIsUndefinedMacroInstr);
+
+  /* Incoming `line handling */
+  class LineTranslationInfo {
+   public:
+    LineTranslationInfo(SymbolId pretendFileId, unsigned int originalLine,
+                        unsigned int pretendLine)
+        : m_pretendFileId(pretendFileId),
+          m_originalLine(originalLine),
+          m_pretendLine(pretendLine) {}
+    SymbolId m_pretendFileId;
+    unsigned int m_originalLine;
+    unsigned int m_pretendLine;
+  };
+
+  /* `ifdef, `ifndef, `elsif, `else Stack */
+  class IfElseItem {
+   public:
+    enum Type { IFDEF, IFNDEF, ELSIF, ELSE };
+    std::string m_macroName;
+    bool m_defined;
+    Type m_type;
+    bool m_previousActiveState;
+  };
+  typedef std::vector<IfElseItem> IfElseStack;
+  IfElseStack m_ifStack;
+  IfElseStack& getStack();
+
+  /* Antlr parser container */
+  class AntlrParserHandler {
+   public:
+    AntlrParserHandler()
+        : m_inputStream(NULL),
+          m_pplexer(NULL),
+          m_pptokens(NULL),
+          m_ppparser(NULL),
+          m_pptree(NULL) {}
+    ~AntlrParserHandler();
+    antlr4::ANTLRInputStream* m_inputStream;
+    SV3_1aPpLexer* m_pplexer;
+    antlr4::CommonTokenStream* m_pptokens;
+    SV3_1aPpParser* m_ppparser;
+    antlr4::tree::ParseTree* m_pptree;
+    DescriptiveErrorListener* m_errorListener;
+  };
+  SV3_1aPpTreeShapeListener* m_listener;
+
+ public:
+  /* Options */
+  void setDebug(int level);
+  bool m_debugPP;
+  bool m_debugPPResult;
+  bool m_debugPPTokens;
+  bool m_debugPPTree;
+  bool m_debugMacro;
+
+  SpecialInstructions m_instructions;
+
+  /* To create the preprocessed content */
+  void append(const std::string& s);
+  void pauseAppend() { m_pauseAppend = true; }
+  void resumeAppend() { m_pauseAppend = false; }
+
+  void addLineTranslationInfo(LineTranslationInfo& info) {
+    m_lineTranslationVec.push_back(info);
+  }
+
+  /* Shorthand for logging an error */
+  void addError(Error& error);
+
+  /* Shorthands for symbol manipulations */
+  SymbolId registerSymbol(const std::string symbol);
+  SymbolId getId(const std::string symbol);
+  const std::string getSymbol(SymbolId id);
+
+  // For recursive macro definition detection
+  PreprocessFile* getSourceFile();
+  LoopCheck m_loopChecker;
+
+  // For cache processing
+  void saveCache();
+  void collectIncludedFiles(std::set<PreprocessFile*>& included);
+  bool usingCachedVersion() { return m_usingCachedVersion; }
+
+ private:
+  std::pair<bool, std::string> evaluateMacro_(
+      const std::string name, std::vector<std::string>& arguments,
+      PreprocessFile* callingFile, unsigned int callingLine,
+      LoopCheck& loopChecker, MacroInfo* macroInfo,
+      SpecialInstructions& instructions, unsigned int embeddedMacroCallLine,
+      SymbolId embeddedMacroCallFile);
+
+  void checkMacroArguments_(const std::string& name, unsigned int line,
+                            unsigned short column,
+                            const std::vector<std::string>& arguments,
+                            const std::vector<std::string>& tokens);
+  void forgetPreprocessor_(PreprocessFile*, PreprocessFile* pp);
+  AntlrParserHandler* m_antlrParserHandler;
+
+  MacroInfo* m_macroInfo; /* Only used when preprocessing a macro content */
+  MacroStorage m_macros;
+
+  CompilationUnit* m_compilationUnit;
+  std::vector<LineTranslationInfo> m_lineTranslationVec;
+  bool m_pauseAppend;
+  bool m_usingCachedVersion;
+  std::vector<IncludeFileInfo> m_includeFileInfo;
+  unsigned int m_embeddedMacroCallLine;
+  SymbolId m_embeddedMacroCallFile;
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* PREPROCESSFILE_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/SV3_1aTreeShapeHelper.h b/SVIncCompil/SourceCompile/SV3_1aTreeShapeHelper.h
index 4fb913c..3e7e4d4 100644
--- a/SVIncCompil/SourceCompile/SV3_1aTreeShapeHelper.h
+++ b/SVIncCompil/SourceCompile/SV3_1aTreeShapeHelper.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   SV3_1aTreeShapeHelper.h
  * Author: alain
  *
@@ -39,95 +39,105 @@
 #include "IncludeFileInfo.h"
 
 namespace SURELOG {
- 
+
 #define SV_MAX_IDENTIFIER_SIZE 1024
-#define SV_MAX_STRING_SIZE 4*1024*1024
-    
-    class SV3_1aTreeShapeHelper {
-    public:
-        typedef enum { Verilog1995, Verilog2001, Verilog2005, Verilog2009, SystemVerilog } VerilogVersion;
-        
-        SV3_1aTreeShapeHelper(ParseFile* pf, antlr4::CommonTokenStream* tokens, unsigned int lineOffset);
-        SV3_1aTreeShapeHelper(ParseLibraryDef* pf, antlr4::CommonTokenStream* tokens);
-        
-        virtual ~SV3_1aTreeShapeHelper();
-        
-        void logError(ErrorDefinition::ErrorType error, ParserRuleContext* ctx, std::string object, bool printColumn = false);
-        
-        void logError(ErrorDefinition::ErrorType, Location& loc, bool showDuplicates = false);
-        
-        void logError(ErrorDefinition::ErrorType, Location& loc, Location& extraLoc, bool showDuplicates = false);
+#define SV_MAX_STRING_SIZE 4 * 1024 * 1024
 
-        NodeId generateDesignElemId();
-        
-        NodeId generateNodeId();
+class SV3_1aTreeShapeHelper {
+ public:
+  typedef enum {
+    Verilog1995,
+    Verilog2001,
+    Verilog2005,
+    Verilog2009,
+    SystemVerilog
+  } VerilogVersion;
 
-	SymbolId registerSymbol(std::string symbol);
+  SV3_1aTreeShapeHelper(ParseFile* pf, antlr4::CommonTokenStream* tokens,
+                        unsigned int lineOffset);
+  SV3_1aTreeShapeHelper(ParseLibraryDef* pf, antlr4::CommonTokenStream* tokens);
 
-	int registerObject(VObject& object);
+  virtual ~SV3_1aTreeShapeHelper();
 
-	int LastObjIndex();
-        
-        int ObjectIndexFromContext(tree::ParseTree* ctx);
+  void logError(ErrorDefinition::ErrorType error, ParserRuleContext* ctx,
+                std::string object, bool printColumn = false);
 
-	VObject& Object(NodeId index);
-        
-        NodeId UniqueId(NodeId index);
-        
-        SymbolId& Name(NodeId index);
-        
-        NodeId& Child(NodeId index);
-        
-        NodeId& Sibling(NodeId index);
-        
-        NodeId& Definition(NodeId index);
-        
-        NodeId& Parent(NodeId index);
-        
-        unsigned short& Type(NodeId index) ;
-        
-        unsigned int& Line(NodeId index);
-        
-        void addNestedDesignElement( ParserRuleContext* ctx, std::string name, DesignElement::ElemType elemtype, VObjectType objtype);
-                
-        void addDesignElement( ParserRuleContext* ctx, std::string name, DesignElement::ElemType elemtype, VObjectType objtype);
-        
-        int addVObject( ParserRuleContext* ctx, std::string name, VObjectType objtype);
-        
-        int addVObject( ParserRuleContext* ctx, VObjectType objtype);
-        
-        void addParentChildRelations(int indexParent, ParserRuleContext* ctx);
-                           
-        NodeId getObjectId(ParserRuleContext* ctx);
-        
-        std::pair<double, TimeInfo::Unit> getTimeValue(SV3_1aParser::Time_literalContext* ctx);
-        
-        FileContent* getFileContent() { return m_fileContent;}
-        
-        unsigned int getFileLine(ParserRuleContext* ctx, SymbolId& fileId);       
-        
-        void setVerilogVersion(VerilogVersion version) { m_version = version; }
-        
-        VerilogVersion getVerilogVersion() { return m_version; }
-        
-    protected:
-        ParseFile* m_pf;
-        FileContent* m_fileContent;
-        DesignElement* m_currentElement;
-        std::stack<DesignElement*> m_nestedElements;
-        typedef std::unordered_map<tree::ParseTree*, NodeId> ContextToObjectMap;
-        ContextToObjectMap m_contextToObjectMap;
-        antlr4::CommonTokenStream* m_tokens;
-        unsigned int m_lineOffset;
-        bool m_ppOutputFileLocation;
-        std::stack<IncludeFileInfo> m_includeFileInfo;
-        VerilogVersion m_version;
-    };
+  void logError(ErrorDefinition::ErrorType, Location& loc,
+                bool showDuplicates = false);
 
+  void logError(ErrorDefinition::ErrorType, Location& loc, Location& extraLoc,
+                bool showDuplicates = false);
+
+  NodeId generateDesignElemId();
+
+  NodeId generateNodeId();
+
+  SymbolId registerSymbol(std::string symbol);
+
+  int registerObject(VObject& object);
+
+  int LastObjIndex();
+
+  int ObjectIndexFromContext(tree::ParseTree* ctx);
+
+  VObject& Object(NodeId index);
+
+  NodeId UniqueId(NodeId index);
+
+  SymbolId& Name(NodeId index);
+
+  NodeId& Child(NodeId index);
+
+  NodeId& Sibling(NodeId index);
+
+  NodeId& Definition(NodeId index);
+
+  NodeId& Parent(NodeId index);
+
+  unsigned short& Type(NodeId index);
+
+  unsigned int& Line(NodeId index);
+
+  void addNestedDesignElement(ParserRuleContext* ctx, std::string name,
+                              DesignElement::ElemType elemtype,
+                              VObjectType objtype);
+
+  void addDesignElement(ParserRuleContext* ctx, std::string name,
+                        DesignElement::ElemType elemtype, VObjectType objtype);
+
+  int addVObject(ParserRuleContext* ctx, std::string name, VObjectType objtype);
+
+  int addVObject(ParserRuleContext* ctx, VObjectType objtype);
+
+  void addParentChildRelations(int indexParent, ParserRuleContext* ctx);
+
+  NodeId getObjectId(ParserRuleContext* ctx);
+
+  std::pair<double, TimeInfo::Unit> getTimeValue(
+      SV3_1aParser::Time_literalContext* ctx);
+
+  FileContent* getFileContent() { return m_fileContent; }
+
+  unsigned int getFileLine(ParserRuleContext* ctx, SymbolId& fileId);
+
+  void setVerilogVersion(VerilogVersion version) { m_version = version; }
+
+  VerilogVersion getVerilogVersion() { return m_version; }
+
+ protected:
+  ParseFile* m_pf;
+  FileContent* m_fileContent;
+  DesignElement* m_currentElement;
+  std::stack<DesignElement*> m_nestedElements;
+  typedef std::unordered_map<tree::ParseTree*, NodeId> ContextToObjectMap;
+  ContextToObjectMap m_contextToObjectMap;
+  antlr4::CommonTokenStream* m_tokens;
+  unsigned int m_lineOffset;
+  bool m_ppOutputFileLocation;
+  std::stack<IncludeFileInfo> m_includeFileInfo;
+  VerilogVersion m_version;
 };
 
+};  // namespace SURELOG
+
 #endif /* SV3_1ATREESHAPEHELPER_H */
-
-
-
-
diff --git a/SVIncCompil/SourceCompile/SymbolTable.h b/SVIncCompil/SourceCompile/SymbolTable.h
index 540a0fb..06335c5 100644
--- a/SVIncCompil/SourceCompile/SymbolTable.h
+++ b/SVIncCompil/SourceCompile/SymbolTable.h
@@ -1,12 +1,12 @@
 /*
  Copyright 2019 Alain Dargelas
- 
+
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at
- 
+
  http://www.apache.org/licenses/LICENSE-2.0
- 
+
  Unless required by applicable law or agreed to in writing, software
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,7 @@
  limitations under the License.
  */
 
-/* 
+/*
  * File:   SymbolTable.h
  * Author: alain
  *
@@ -30,39 +30,36 @@
 
 namespace SURELOG {
 
-typedef unsigned long SymbolId; // 64 bit
+typedef unsigned long SymbolId;  // 64 bit
 
-typedef unsigned int NodeId;    // 32 bit
+typedef unsigned int NodeId;  // 32 bit
 
 #define InvalidNodeId 969696
 
 class SymbolTable {
-public:
-    SymbolTable();
-   // SymbolTable(const SymbolTable& orig);
-    
-    SymbolId registerSymbol(const std::string symbol);
-    SymbolId getId(const std::string symbol);
-    const std::string getSymbol(SymbolId id);
-    const std::string getBadSymbol() { return m_badSymbol; }
-    const SymbolId getBadId() { return m_badId; }
-    virtual ~SymbolTable();
-    
-    static const std::string getEmptyMacroMarker() { return m_emptyMacroMarker; }
-    std::vector<std::string>& getSymbols() { return m_id2SymbolMap; }
-private:
-    SymbolId m_idCounter;
-    std::vector<std::string> m_id2SymbolMap;
-    std::unordered_map<std::string, SymbolId> m_symbol2IdMap;
-    static std::string m_badSymbol;
-    static SymbolId    m_badId;
-    static std::string m_emptyMacroMarker;
+ public:
+  SymbolTable();
+  // SymbolTable(const SymbolTable& orig);
+
+  SymbolId registerSymbol(const std::string symbol);
+  SymbolId getId(const std::string symbol);
+  const std::string getSymbol(SymbolId id);
+  const std::string getBadSymbol() { return m_badSymbol; }
+  const SymbolId getBadId() { return m_badId; }
+  virtual ~SymbolTable();
+
+  static const std::string getEmptyMacroMarker() { return m_emptyMacroMarker; }
+  std::vector<std::string>& getSymbols() { return m_id2SymbolMap; }
+
+ private:
+  SymbolId m_idCounter;
+  std::vector<std::string> m_id2SymbolMap;
+  std::unordered_map<std::string, SymbolId> m_symbol2IdMap;
+  static std::string m_badSymbol;
+  static SymbolId m_badId;
+  static std::string m_emptyMacroMarker;
 };
 
-};
+};  // namespace SURELOG
 
 #endif /* SYMBOLTABLE_H */
-
-
-
-
diff --git a/SVIncCompil/Testcases/Monitor/Monitor_diff.log b/SVIncCompil/Testcases/Monitor/Monitor_diff.log
index e35e82c..291fde3 100644
--- a/SVIncCompil/Testcases/Monitor/Monitor_diff.log
+++ b/SVIncCompil/Testcases/Monitor/Monitor_diff.log
@@ -827,5 +827,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-11.67user 0.14system 0:11.81elapsed 99%CPU (0avgtext+0avgdata 268572maxresident)k
-0inputs+15192outputs (0major+69429minor)pagefaults 0swaps
+13.17user 0.18system 0:13.36elapsed 99%CPU (0avgtext+0avgdata 268520maxresident)k
+0inputs+15192outputs (0major+69425minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/OldLibrary/OldLibrary.log b/SVIncCompil/Testcases/OldLibrary/OldLibrary.log
index 1e96377..a77b0c0 100644
--- a/SVIncCompil/Testcases/OldLibrary/OldLibrary.log
+++ b/SVIncCompil/Testcases/OldLibrary/OldLibrary.log
@@ -82,5 +82,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-0.19user 0.05system 0:00.24elapsed 99%CPU (0avgtext+0avgdata 45528maxresident)k
-0inputs+144outputs (0major+10884minor)pagefaults 0swaps
+0.20user 0.02system 0:00.22elapsed 99%CPU (0avgtext+0avgdata 45424maxresident)k
+0inputs+144outputs (0major+10883minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/SimpleCmdLineTest/SimpleCmdLineTest.log b/SVIncCompil/Testcases/SimpleCmdLineTest/SimpleCmdLineTest.log
index 142b881..c3f7347 100644
--- a/SVIncCompil/Testcases/SimpleCmdLineTest/SimpleCmdLineTest.log
+++ b/SVIncCompil/Testcases/SimpleCmdLineTest/SimpleCmdLineTest.log
@@ -25,5 +25,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-0.13user 0.01system 0:00.15elapsed 100%CPU (0avgtext+0avgdata 45668maxresident)k
-0inputs+32outputs (0major+10053minor)pagefaults 0swaps
+0.10user 0.03system 0:00.14elapsed 100%CPU (0avgtext+0avgdata 45416maxresident)k
+0inputs+32outputs (0major+10035minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/SimpleUVM/SimpleUVM.log b/SVIncCompil/Testcases/SimpleUVM/SimpleUVM.log
index ceb0a01..dc66c3c 100644
--- a/SVIncCompil/Testcases/SimpleUVM/SimpleUVM.log
+++ b/SVIncCompil/Testcases/SimpleUVM/SimpleUVM.log
@@ -763,5 +763,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-2.24user 0.07system 0:02.32elapsed 99%CPU (0avgtext+0avgdata 116760maxresident)k
-0inputs+7688outputs (0major+31462minor)pagefaults 0swaps
+2.64user 0.10system 0:02.75elapsed 99%CPU (0avgtext+0avgdata 116744maxresident)k
+0inputs+7688outputs (0major+31465minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/SimpleVMM/SimpleVMM_diff.log b/SVIncCompil/Testcases/SimpleVMM/SimpleVMM_diff.log
index 38c42be..151c424 100644
--- a/SVIncCompil/Testcases/SimpleVMM/SimpleVMM_diff.log
+++ b/SVIncCompil/Testcases/SimpleVMM/SimpleVMM_diff.log
@@ -103,10 +103,6 @@
 
 [INFO :PP0123] Preprocessing include file "../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_test.sv".
 
-[INFO :PA0201] Parsing source file "top.v".
-
-[INFO :PA0201] Parsing source file "top.v".
-
 [INFO :PA0201] Parsing source file "/home/alain/Surelog/SVIncCompil/dist/surelog/bin/../sv/builtin.sv".
 
 [INFO :PA0201] Parsing source file "top.v".
@@ -121,78 +117,78 @@
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2625 Compile class "work@vmm_broadcast".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1540 Compile class "work@vmm_data".
-
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1801 Compile class "work@vmm_channel".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2192 Compile class "work@vmm_env".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1040 Compile class "work@vmm_log_callbacks".
-
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2002 Compile class "work@vmm_consensus".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1748 Compile class "work@vmm_ms_scenario".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1540 Compile class "work@vmm_data".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_log.sv:93 Compile class "work@vmm_log_catcher_descr".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2192 Compile class "work@vmm_env".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1076 Compile class "work@vmm_log".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_log.sv:286 Compile class "work@vmm_log_below_iter".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1430 Compile class "work@vmm_notification".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1040 Compile class "work@vmm_log_callbacks".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1063 Compile class "work@vmm_log_catcher".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1449 Compile class "work@vmm_notify".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_log.sv:93 Compile class "work@vmm_log_catcher_descr".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1013 Compile class "work@vmm_log_format".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_log.sv:44 Compile class "work@vmm_log_watchpoint".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_version.sv:28 Compile class "work@vmm_version".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1683 Compile class "work@vmm_scenario".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1776 Compile class "work@vmm_ms_scenario_election".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2378 Compile class "work@vmm_xactor".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2533 Compile class "work@vmm_ms_scenario_gen_callbacks".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2304 Compile class "work@vmm_subenv".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_notify.sv:23 Compile class "work@vmm_notification_config".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1425 Compile class "work@vmm_notify_callbacks".
-
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_log.sv:23 Compile class "work@vmm_log_modifier".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2374 Compile class "work@vmm_xactor_callbacks".
-
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:966 Compile class "work@vmm_opts".
-
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_log.sv:65 Compile class "work@vmm_log_msg".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2511 Compile class "work@vmm_xactor_iter".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_log.sv:44 Compile class "work@vmm_log_watchpoint".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_opts.sv:23 Compile class "work@vmm_opts_info".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1748 Compile class "work@vmm_ms_scenario".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1776 Compile class "work@vmm_ms_scenario_election".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2553 Compile class "work@vmm_ms_scenario_gen".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:733 Compile class "work@xvc_action_channel".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2533 Compile class "work@vmm_ms_scenario_gen_callbacks".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2678 Compile class "work@vmm_scheduler_election".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1430 Compile class "work@vmm_notification".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_test.sv:24 Compile class "work@vmm_test_registry".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_notify.sv:23 Compile class "work@vmm_notification_config".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1449 Compile class "work@vmm_notify".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1425 Compile class "work@vmm_notify_callbacks".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:966 Compile class "work@vmm_opts".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_opts.sv:23 Compile class "work@vmm_opts_info".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:1683 Compile class "work@vmm_scenario".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2710 Compile class "work@vmm_scheduler".
 
-[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2757 Compile class "work@xvc_action".
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2678 Compile class "work@vmm_scheduler_election".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2304 Compile class "work@vmm_subenv".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2876 Compile class "work@vmm_test".
 
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_test.sv:24 Compile class "work@vmm_test_registry".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm_version.sv:28 Compile class "work@vmm_version".
+
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2149 Compile class "work@vmm_voter".
 
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2378 Compile class "work@vmm_xactor".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2374 Compile class "work@vmm_xactor_callbacks".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2511 Compile class "work@vmm_xactor_iter".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2757 Compile class "work@xvc_action".
+
+[INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:733 Compile class "work@xvc_action_channel".
+
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2850 Compile class "work@xvc_manager".
 
 [INFO :CP0302] ../../../UVM/vmm-1.1.1a/sv/std_lib/vmm.sv:2800 Compile class "work@xvc_xactor".
@@ -216,5 +212,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-24.47user 0.20system 0:15.77elapsed 156%CPU (0avgtext+0avgdata 291492maxresident)k
-1144inputs+12104outputs (0major+75196minor)pagefaults 0swaps
+24.72user 0.19system 0:24.92elapsed 99%CPU (0avgtext+0avgdata 291300maxresident)k
+0inputs+11392outputs (0major+75116minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/UnitDefParam/UnitDefParam_diff.log b/SVIncCompil/Testcases/UnitDefParam/UnitDefParam_diff.log
index 4922268..0c217b7 100644
--- a/SVIncCompil/Testcases/UnitDefParam/UnitDefParam_diff.log
+++ b/SVIncCompil/Testcases/UnitDefParam/UnitDefParam_diff.log
@@ -990,5 +990,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-0.75user 0.03system 0:00.78elapsed 100%CPU (0avgtext+0avgdata 45660maxresident)k
-0inputs+144outputs (0major+13712minor)pagefaults 0swaps
+0.86user 0.04system 0:00.91elapsed 99%CPU (0avgtext+0avgdata 45716maxresident)k
+0inputs+144outputs (0major+13724minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/UnitForLoop/UnitForLoop.log b/SVIncCompil/Testcases/UnitForLoop/UnitForLoop.log
index 761de31..3555676 100644
--- a/SVIncCompil/Testcases/UnitForLoop/UnitForLoop.log
+++ b/SVIncCompil/Testcases/UnitForLoop/UnitForLoop.log
@@ -328,5 +328,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-0.34user 0.03system 0:00.38elapsed 100%CPU (0avgtext+0avgdata 45492maxresident)k
-0inputs+16outputs (0major+13203minor)pagefaults 0swaps
+0.43user 0.02system 0:00.46elapsed 100%CPU (0avgtext+0avgdata 45476maxresident)k
+0inputs+16outputs (0major+13193minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/UnitPackage/UnitPackage.log b/SVIncCompil/Testcases/UnitPackage/UnitPackage.log
index 287a715..3720eca 100644
--- a/SVIncCompil/Testcases/UnitPackage/UnitPackage.log
+++ b/SVIncCompil/Testcases/UnitPackage/UnitPackage.log
@@ -1014,5 +1014,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-1.49user 0.04system 0:01.53elapsed 99%CPU (0avgtext+0avgdata 58768maxresident)k
-0inputs+160outputs (0major+16993minor)pagefaults 0swaps
+1.46user 0.03system 0:01.49elapsed 99%CPU (0avgtext+0avgdata 58704maxresident)k
+0inputs+160outputs (0major+17004minor)pagefaults 0swaps
diff --git a/SVIncCompil/Testcases/YosysSmall/YosysSmall_diff.log b/SVIncCompil/Testcases/YosysSmall/YosysSmall_diff.log
index 96a887b..a1a1118 100644
--- a/SVIncCompil/Testcases/YosysSmall/YosysSmall_diff.log
+++ b/SVIncCompil/Testcases/YosysSmall/YosysSmall_diff.log
@@ -71,5 +71,5 @@
 *   End SURELOG SVerilog Compiler/Linter   *
 ********************************************
 
-1.52user 0.03system 0:01.55elapsed 100%CPU (0avgtext+0avgdata 48368maxresident)k
-0inputs+608outputs (0major+9730minor)pagefaults 0swaps
+1.82user 0.01system 0:01.84elapsed 99%CPU (0avgtext+0avgdata 48448maxresident)k
+0inputs+608outputs (0major+9740minor)pagefaults 0swaps
diff --git a/SVIncCompil/nbproject/private/private.xml b/SVIncCompil/nbproject/private/private.xml
index cec80cb..e90b936 100644
--- a/SVIncCompil/nbproject/private/private.xml
+++ b/SVIncCompil/nbproject/private/private.xml
@@ -2,12 +2,16 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <data xmlns="http://www.netbeans.org/ns/make-project-private/1">
         <activeConfTypeElem>1</activeConfTypeElem>
-        <activeConfIndexElem>1</activeConfIndexElem>
+        <activeConfIndexElem>0</activeConfIndexElem>
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/alain/Surelog/SVIncCompil/Design/DefParam.cpp</file>
+            <file>file:/home/alain/Surelog/SVIncCompil/SourceCompile/PreprocessFile.cpp</file>
+            <file>file:/home/alain/Surelog/SVIncCompil/Design/DesignElement.h</file>
+            <file>file:/home/alain/Surelog/SVIncCompil/Design/ModuleDefinition.h</file>
+            <file>file:/home/alain/Surelog/SVIncCompil/Design/Design.h</file>
+            <file>file:/home/alain/Surelog/SVIncCompil/Design/DesignComponent.h</file>
         </group>
     </open-files>
 </project-private>