From 10e1bae34733f1cdb5abc001666b1aafa1c1f406 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Thu, 22 Oct 2020 08:46:12 -0400 Subject: Single pass C++ extraction (#1583) * #include an absolute path didn't work - because paths were taken to always be relative. * Added CharUtil. Added TypeSet to extractor. First pass at being able to specify all headers for multiple output headers. * Fix includes for new C++ extractor convension. Update premake5 to use new extractor mechanisms. * Small improvements around StringUtil. * Split out NameConventionUtil. * Use a 'convert' to convert between convention types. * Fix output of build message for C++ extractor. Improve NameConventionUtil interface. * Improve comments. * Fix warning on gcc. * Fix clang warning. * Fix some typos in NameConventionUtil. * Small fix to premake5.lua * Fix generated includes. * Remove m_reflectType as no longer applicable with TypeSet. * Fix .gitignore for slang-generated-* files. Added getConvention to determine convention from slice. Add versions of split and convert that infer the from convention * Fix typo in spliting camel. * LineWhitespace -> HorizontalWhitespace * Improve CharUtil comments. --- tools/slang-cpp-extractor/slang-cpp-extractor-diagnostic-defs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/slang-cpp-extractor/slang-cpp-extractor-diagnostic-defs.h') diff --git a/tools/slang-cpp-extractor/slang-cpp-extractor-diagnostic-defs.h b/tools/slang-cpp-extractor/slang-cpp-extractor-diagnostic-defs.h index 97bc8eea0..3ab133414 100644 --- a/tools/slang-cpp-extractor/slang-cpp-extractor-diagnostic-defs.h +++ b/tools/slang-cpp-extractor/slang-cpp-extractor-diagnostic-defs.h @@ -23,7 +23,7 @@ DIAGNOSTIC(-1, Note, seeOpen, "see open $0") DIAGNOSTIC(1, Error, cannotOpenFile, "cannot open file '$0'.") -DIAGNOSTIC(1, Error, extractorFailed, "C++ Extractor failed for '$0'") +DIAGNOSTIC(1, Error, extractorFailed, "C++ Extractor failed") DIAGNOSTIC(1, Error, internalError, "Unknown internal error in C++ Extractor, aborted!") // Parsing errors @@ -40,6 +40,7 @@ DIAGNOSTIC(100009, Error, unexpectedUnbalancedToken, "Unexpected unbalanced toke DIAGNOSTIC(100010, Error, unexpectedEndOfFile, "Unexpected end of file") DIAGNOSTIC(100011, Error, expectingTypeKeyword, "Expecting type keyword - struct or class, found $0") +DIAGNOSTIC(100011, Error, typeInDifferentTypeSet, "Type $0 in different type set $1 from super class $2") // Command line errors 100100 -- cgit v1.2.3