From f59978893fed309ff19bacd787398c4bab4aa7c8 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Mon, 4 May 2020 13:46:24 -0400 Subject: C++ Extractor (#1337) * WIP: Doing texing using slangs lexer for cpp-extractor * Node tree for C++ extraction. * Bug fixing. Add dump of hierarchy. * First pass at extracting fields. * Parse template types. * Use diagnostics defs for C++ extractor. * Simplify Diagnostic Defs. * Remove the brace stack. * Added IdentifierLookup. * Add handling for >> style template close. * Improved identifier handling/keywords. * Added ability to check if reader is at cursor position. * Handling of an unspecified root type. * Parsing code comments. Tidy up some parsing - to use advanceIf functions more. * Improve path handling. * Fixes around changes to Path interface. * Working Range, Type and Scope header. * Extract the middle part of marker and put in output. Gives more flexibility at macro injection, and in class definitions. * Split DERIVED types into it's own macro, to provide way to generate for derived types. * Fix clang/g++ compile issue. * Tabs -> spaces. * Fix small bug in getFileNameWithoutExt * Small improvement around naming. Co-authored-by: Tim Foley --- source/slang/slang-state-serialize.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/slang/slang-state-serialize.cpp') diff --git a/source/slang/slang-state-serialize.cpp b/source/slang/slang-state-serialize.cpp index 9122b80fd..abdaae7c6 100644 --- a/source/slang/slang-state-serialize.cpp +++ b/source/slang/slang-state-serialize.cpp @@ -571,7 +571,7 @@ static bool _isStorable(const PathInfo::Type type) } String filename = Path::getFileNameWithoutExt(path); - String ext = Path::getFileExt(path); + String ext = Path::getPathExt(path); StringBuilder uniqueName; for (Index j = 0; j < 0x10000; j++) @@ -1121,7 +1121,7 @@ struct LoadContext String parentDir = Path::getParentDirectory(absPath); String baseName = Path::getFileNameWithoutExt(filename); - String ext = Path::getFileExt(filename); + String ext = Path::getPathExt(filename); if (ext.getLength() == 0) { -- cgit v1.2.3