Move c++ parsing code from slang-cpp-extractor to static library (shader-slang#5675)

laurooyen · slangbot · csyonghe · web-flow · commit eaa8dcfcc9de · 2024-12-02T11:46:43.000-08:00
* Move c++ parsing code from slang-cpp-extractor to static library

* Format code

* Remove relative includes

---------

Co-authored-by: slangbot &lt;ellieh+slangbot@nvidia.com&gt;
Co-authored-by: Yong He &lt;yonghe@outlook.com&gt;
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -49,6 +49,7 @@ generator(
     USE_FEWER_WARNINGS
     LINK_WITH_PRIVATE
     compiler-core
+    slang-cpp-parser
 )
 generator(slang-embed)
 generator(slang-generate USE_FEWER_WARNINGS)
@@ -68,6 +69,15 @@ generator(
     Threads::Threads
 )
 
+slang_add_target(
+    slang-cpp-parser
+    STATIC
+    USE_FEWER_WARNINGS
+    LINK_WITH_PRIVATE core compiler-core
+    INCLUDE_DIRECTORIES_PUBLIC .
+    FOLDER generators
+)
+
 #
 # Language Server
 #
diff --git a/tools/slang-cpp-extractor/cpp-extractor-main.cpp b/tools/slang-cpp-extractor/cpp-extractor-main.cpp
@@ -1,27 +1,27 @@
 // main.cpp
 
-#include "../../source/compiler-core/slang-diagnostic-sink.h"
-#include "../../source/compiler-core/slang-doc-extractor.h"
-#include "../../source/compiler-core/slang-lexer.h"
-#include "../../source/compiler-core/slang-name-convention-util.h"
-#include "../../source/compiler-core/slang-name.h"
-#include "../../source/compiler-core/slang-source-loc.h"
-#include "../../source/core/slang-file-system.h"
-#include "../../source/core/slang-io.h"
-#include "../../source/core/slang-list.h"
-#include "../../source/core/slang-secure-crt.h"
-#include "../../source/core/slang-string-slice-pool.h"
-#include "../../source/core/slang-string-util.h"
-#include "../../source/core/slang-string.h"
-#include "../../source/core/slang-writer.h"
-#include "diagnostics.h"
-#include "file-util.h"
+#include "compiler-core/slang-diagnostic-sink.h"
+#include "compiler-core/slang-doc-extractor.h"
+#include "compiler-core/slang-lexer.h"
+#include "compiler-core/slang-name-convention-util.h"
+#include "compiler-core/slang-name.h"
+#include "compiler-core/slang-source-loc.h"
+#include "core/slang-file-system.h"
+#include "core/slang-io.h"
+#include "core/slang-list.h"
+#include "core/slang-secure-crt.h"
+#include "core/slang-string-slice-pool.h"
+#include "core/slang-string-util.h"
+#include "core/slang-string.h"
+#include "core/slang-writer.h"
 #include "macro-writer.h"
-#include "node.h"
-#include "options.h"
-#include "parser.h"
 #include "slang-com-helper.h"
-#include "unit-test.h"
+#include "slang-cpp-parser/diagnostics.h"
+#include "slang-cpp-parser/file-util.h"
+#include "slang-cpp-parser/node.h"
+#include "slang-cpp-parser/options.h"
+#include "slang-cpp-parser/parser.h"
+#include "slang-cpp-parser/unit-test.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/slang-cpp-extractor/macro-writer.cpp b/tools/slang-cpp-extractor/macro-writer.cpp
@@ -1,22 +1,20 @@
 #include "macro-writer.h"
 
-#include "../../source/core/slang-list.h"
-#include "../../source/core/slang-string.h"
+#include "compiler-core/slang-diagnostic-sink.h"
+#include "core/slang-io.h"
+#include "core/slang-list.h"
+#include "core/slang-string.h"
+#include "core/slang-writer.h"
 #include "slang-com-helper.h"
-// #include "../../source/core/slang-string-util.h"
-#include "../../source/compiler-core/slang-diagnostic-sink.h"
-#include "../../source/core/slang-io.h"
-#include "../../source/core/slang-writer.h"
-// #include "../../source/compiler-core/slang-name.h"
-
-#include "diagnostics.h"
-#include "file-util.h"
-#include "node-tree.h"
-#include "options.h"
+#include "slang-cpp-parser/diagnostics.h"
+#include "slang-cpp-parser/file-util.h"
+#include "slang-cpp-parser/node-tree.h"
+#include "slang-cpp-parser/options.h"
 
 namespace CppExtract
 {
 using namespace Slang;
+using namespace CppParse;
 
 SLANG_FORCE_INLINE static void _indent(Index indentCount, StringBuilder& out)
 {
diff --git a/tools/slang-cpp-extractor/macro-writer.h b/tools/slang-cpp-extractor/macro-writer.h
@@ -1,14 +1,14 @@
-#ifndef CPP_EXTRACT_MACRO_WRITER_H
-#define CPP_EXTRACT_MACRO_WRITER_H
+#pragma once
 
-#include "../../source/compiler-core/slang-diagnostic-sink.h"
-#include "diagnostics.h"
-#include "node-tree.h"
-#include "options.h"
+#include "compiler-core/slang-diagnostic-sink.h"
+#include "slang-cpp-parser/diagnostics.h"
+#include "slang-cpp-parser/node-tree.h"
+#include "slang-cpp-parser/options.h"
 
 namespace CppExtract
 {
 using namespace Slang;
+using namespace CppParse;
 
 /* A class that writes out macros that define type hierarchies, as well as fields of types */
 class MacroWriter
@@ -39,5 +39,3 @@ class MacroWriter
 };
 
 } // namespace CppExtract
-
-#endif
diff --git a/tools/slang-cpp-extractor/unit-test.h b/tools/slang-cpp-extractor/unit-test.h
diff --git a/tools/slang-cpp-parser/diagnostic-defs.h b/tools/slang-cpp-parser/diagnostic-defs.h
@@ -14,7 +14,7 @@
 // for any arguments.
 
 #ifndef DIAGNOSTIC
-#error Need to #define DIAGNOSTIC(...) before including "slang-cpp-extractor-diagnostics-defs.h"
+#error Need to #define DIAGNOSTIC(...) before including "slang-cpp-parser/diagnostics-defs.h"
 #define DIAGNOSTIC(id, severity, name, messageFormat) /* */
 #endif
 
diff --git a/tools/slang-cpp-parser/diagnostics.cpp b/tools/slang-cpp-parser/diagnostics.cpp
@@ -1,6 +1,6 @@
 #include "diagnostics.h"
 
-namespace CppExtract
+namespace CppParse
 {
 
 namespace CPPDiagnostics
@@ -12,4 +12,4 @@ using namespace Slang;
 #include "diagnostic-defs.h"
 } // namespace CPPDiagnostics
 
-} // namespace CppExtract
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/diagnostics.h b/tools/slang-cpp-parser/diagnostics.h
@@ -1,9 +1,8 @@
-#ifndef CPP_EXTRACT_DIAGNOSTICS_H
-#define CPP_EXTRACT_DIAGNOSTICS_H
+#pragma once
 
-#include "../../source/slang/slang-diagnostics.h"
+#include "slang/slang-diagnostics.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -14,6 +13,4 @@ namespace CPPDiagnostics
 #include "diagnostic-defs.h"
 
 } // namespace CPPDiagnostics
-} // namespace CppExtract
-
-#endif
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/file-util.cpp b/tools/slang-cpp-parser/file-util.cpp
@@ -1,8 +1,8 @@
 #include "file-util.h"
 
-#include "../../source/core/slang-io.h"
+#include "core/slang-io.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -98,4 +98,4 @@ struct DiagnosticReporter
     }
 }
 
-} // namespace CppExtract
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/file-util.h b/tools/slang-cpp-parser/file-util.h
@@ -1,9 +1,8 @@
-#ifndef CPP_EXTRACT_FILE_UTIL_H
-#define CPP_EXTRACT_FILE_UTIL_H
+#pragma once
 
 #include "diagnostics.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -29,6 +28,4 @@ struct FileUtil
     static void indent(Index indentCount, StringBuilder& out);
 };
 
-} // namespace CppExtract
-
-#endif
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/identifier-lookup.cpp b/tools/slang-cpp-parser/identifier-lookup.cpp
@@ -1,6 +1,6 @@
 #include "identifier-lookup.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -174,4 +174,4 @@ void IdentifierLookup::initDefault(const UnownedStringSlice& markPrefix)
     }
 }
 
-} // namespace CppExtract
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/identifier-lookup.h b/tools/slang-cpp-parser/identifier-lookup.h
@@ -1,9 +1,8 @@
-#ifndef CPP_EXTRACT_IDENTIFIER_LOOKUP_H
-#define CPP_EXTRACT_IDENTIFIER_LOOKUP_H
+#pragma once
 
 #include "diagnostics.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -119,6 +118,4 @@ SLANG_FORCE_INLINE bool hasFlag(IdentifierStyle style, IdentifierFlag::Enum flag
     return (getFlags(style) & flag) != 0;
 }
 
-} // namespace CppExtract
-
-#endif
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/node-tree.cpp b/tools/slang-cpp-parser/node-tree.cpp
@@ -1,11 +1,11 @@
 #include "node-tree.h"
 
-#include "../../source/compiler-core/slang-name-convention-util.h"
-#include "../../source/core/slang-io.h"
+#include "compiler-core/slang-name-convention-util.h"
+#include "core/slang-io.h"
 #include "identifier-lookup.h"
 #include "options.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -173,4 +173,4 @@ SlangResult NodeTree::calcDerivedTypes(DiagnosticSink* sink)
 }
 
 
-} // namespace CppExtract
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/node-tree.h b/tools/slang-cpp-parser/node-tree.h
@@ -1,12 +1,11 @@
-#ifndef CPP_EXTRACT_NODE_TREE_H
-#define CPP_EXTRACT_NODE_TREE_H
+#pragma once
 
-#include "../../source/compiler-core/slang-lexer.h"
+#include "compiler-core/slang-lexer.h"
 #include "diagnostics.h"
 #include "identifier-lookup.h"
 #include "node.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -99,6 +98,4 @@ class NodeTree
     List<RefPtr<SourceOrigin>> m_sourceOrigins;
 };
 
-} // namespace CppExtract
-
-#endif
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/node.cpp b/tools/slang-cpp-parser/node.cpp
@@ -1,10 +1,10 @@
 #include "node.h"
 
-#include "../../source/core/slang-string-escape-util.h"
-#include "../../source/core/slang-string-util.h"
+#include "core/slang-string-escape-util.h"
+#include "core/slang-string-util.h"
 #include "file-util.h"
 
-namespace CppExtract
+namespace CppParse
 {
 
 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Node Impl
@@ -697,4 +697,4 @@ void ClassLikeNode::dump(int indentCount, StringBuilder& out)
     out << "}\n";
 }
 
-} // namespace CppExtract
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/node.h b/tools/slang-cpp-parser/node.h
@@ -1,10 +1,9 @@
-#ifndef CPP_EXTRACT_NODE_H
-#define CPP_EXTRACT_NODE_H
+#pragma once
 
-#include "../../source/compiler-core/slang-doc-extractor.h"
+#include "compiler-core/slang-doc-extractor.h"
 #include "diagnostics.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -420,6 +419,4 @@ T* as(Node* node)
     return (node && T::isOfKind(node->m_kind)) ? static_cast<T*>(node) : nullptr;
 }
 
-} // namespace CppExtract
-
-#endif
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/options.cpp b/tools/slang-cpp-parser/options.cpp
@@ -2,7 +2,7 @@
 
 #include "diagnostics.h"
 
-namespace CppExtract
+namespace CppParse
 {
 
 SlangResult OptionsParser::_parseArgFlag(const char* option, bool& outFlag)
@@ -150,4 +150,4 @@ SlangResult OptionsParser::parse(
     return SLANG_OK;
 }
 
-} // namespace CppExtract
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/options.h b/tools/slang-cpp-parser/options.h
@@ -1,9 +1,8 @@
-#ifndef CPP_EXTRACT_OPTIONS_H
-#define CPP_EXTRACT_OPTIONS_H
+#pragma once
 
-#include "../../source/slang/slang-diagnostics.h"
+#include "slang/slang-diagnostics.h"
 
-namespace CppExtract
+namespace CppParse
 {
 using namespace Slang;
 
@@ -61,7 +60,4 @@ struct OptionsParser
     DiagnosticSink* m_sink;
 };
 
-
-} // namespace CppExtract
-
-#endif
+} // namespace CppParse
diff --git a/tools/slang-cpp-parser/parser.cpp b/tools/slang-cpp-parser/parser.cpp
diff --git a/tools/slang-cpp-parser/parser.h b/tools/slang-cpp-parser/parser.h
diff --git a/tools/slang-cpp-parser/unit-test.cpp b/tools/slang-cpp-parser/unit-test.cpp
diff --git a/tools/slang-cpp-parser/unit-test.h b/tools/slang-cpp-parser/unit-test.h

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ generator(`
`49`	`49`	`USE_FEWER_WARNINGS`
`50`	`50`	`LINK_WITH_PRIVATE`
`51`	`51`	`compiler-core`
	`52`	`+ slang-cpp-parser`
`52`	`53`	`)`
`53`	`54`	`generator(slang-embed)`
`54`	`55`	`generator(slang-generate USE_FEWER_WARNINGS)`
`@@ -68,6 +69,15 @@ generator(`
`68`	`69`	`Threads::Threads`
`69`	`70`	`)`
`70`	`71`
	`72`	`+slang_add_target(`
	`73`	`+ slang-cpp-parser`
	`74`	`+ STATIC`
	`75`	`+ USE_FEWER_WARNINGS`
	`76`	`+ LINK_WITH_PRIVATE core compiler-core`
	`77`	`+ INCLUDE_DIRECTORIES_PUBLIC .`
	`78`	`+ FOLDER generators`
	`79`	`+)`
	`80`	`+`
`71`	`81`	`#`
`72`	`82`	`# Language Server`
`73`	`83`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`#include "file-util.h"`
`2`	`2`
`3`		`-#include "../../source/core/slang-io.h"`
	`3`	`+#include "core/slang-io.h"`
`4`	`4`
`5`		`-namespace CppExtract`
	`5`	`+namespace CppParse`
`6`	`6`	`{`
`7`	`7`	`using namespace Slang;`
`8`	`8`
`@@ -98,4 +98,4 @@ struct DiagnosticReporter`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`-} // namespace CppExtract`
	`101`	`+} // namespace CppParse`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "identifier-lookup.h"`
`2`	`2`
`3`		`-namespace CppExtract`
	`3`	`+namespace CppParse`
`4`	`4`	`{`
`5`	`5`	`using namespace Slang;`
`6`	`6`
`@@ -174,4 +174,4 @@ void IdentifierLookup::initDefault(const UnownedStringSlice& markPrefix)`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`177`		`-} // namespace CppExtract`
	`177`	`+} // namespace CppParse`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#include "diagnostics.h"`
`4`	`4`
`5`		`-namespace CppExtract`
	`5`	`+namespace CppParse`
`6`	`6`	`{`
`7`	`7`
`8`	`8`	`SlangResult OptionsParser::_parseArgFlag(const char* option, bool& outFlag)`
`@@ -150,4 +150,4 @@ SlangResult OptionsParser::parse(`
`150`	`150`	`return SLANG_OK;`
`151`	`151`	`}`
`152`	`152`
`153`		`-} // namespace CppExtract`
	`153`	`+} // namespace CppParse`