From 5abee6a0a30c7c965138ec7286b7f1b21b201731 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Tue, 25 Apr 2023 12:25:52 -0400
Subject: StringBuilder to lowerCamel (#2840)

* #include an absolute path didn't work - because paths were taken to always be relative.

* WIP lowerCamel Dictionary.

* WIP more lowerCamel fixes for Dictionary.

* Add/Remove/Clear

* GetValue/Contains

* Fix tabs in dictionary.
Count -> getCount

* Fix fields with caps.

* Key -> key
Value -> value
Use m_ for members where appropriate.
Use lowerCamel in linked list.

* Some small fixes/improvements to Dictionary.

* Kick CI.

* Small tidy on String.

* Append -> append

* ToString -> toString
ProduceString -> produceString

* Small fixes.

* StringToXXX -> stringToXXX

* Fix typo introduced by Append -> append.

* Made intToAscii do reversal at the end.

---------

Co-authored-by: Yong He <yonghe@outlook.com>
---
 source/slang/slang-parser.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'source/slang/slang-parser.cpp')

diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp
index b3c9f9942..256d7aae1 100644
--- a/source/slang/slang-parser.cpp
+++ b/source/slang/slang-parser.cpp
@@ -891,17 +891,17 @@ namespace Slang
         StringBuilder scopedIdentifierBuilder;
         if (initialTokenType == TokenType::Scope)
         {
-            scopedIdentifierBuilder.Append('_'); 
+            scopedIdentifierBuilder.append('_'); 
         }
-        scopedIdentifierBuilder.Append(firstIdentifier.getContent());
+        scopedIdentifierBuilder.append(firstIdentifier.getContent());
 
         while (parser->tokenReader.peekTokenType() == TokenType::Scope)
         {
             parser->ReadToken(TokenType::Scope);
-            scopedIdentifierBuilder.Append('_'); 
+            scopedIdentifierBuilder.append('_'); 
             
             const Token nextIdentifier(parser->ReadToken(TokenType::Identifier));
-            scopedIdentifierBuilder.Append(nextIdentifier.getContent());
+            scopedIdentifierBuilder.append(nextIdentifier.getContent());
         }
 
         // Make a 'token'
@@ -1195,7 +1195,7 @@ namespace Slang
                     sb << parser->ReadToken(TokenType::Identifier).getContent();
                 }
 
-                moduleNameAndLoc.name = getName(parser, sb.ProduceString());
+                moduleNameAndLoc.name = getName(parser, sb.produceString());
             }
 
             decl->moduleNameAndLoc = moduleNameAndLoc;
@@ -5819,7 +5819,7 @@ namespace Slang
                         token = parser->tokenReader.advanceToken();
                         sb << getStringLiteralTokenValue(token);
                     }
-                    constExpr->value = sb.ProduceString();
+                    constExpr->value = sb.produceString();
                 }
 
                 return constExpr;
@@ -6244,11 +6244,11 @@ namespace Slang
         {
             if (AdvanceIf(parser, TokenType::OpSub))
             {
-                modifier->op = IROp(-StringToInt(parser->ReadToken().getContent()));
+                modifier->op = IROp(-stringToInt(parser->ReadToken().getContent()));
             }
             else if (parser->LookAheadToken(TokenType::IntegerLiteral))
             {
-                modifier->op = IROp(StringToInt(parser->ReadToken().getContent()));
+                modifier->op = IROp(stringToInt(parser->ReadToken().getContent()));
             }
             else
             {
@@ -6513,7 +6513,7 @@ namespace Slang
     {
         BuiltinTypeModifier* modifier = parser->astBuilder->create<BuiltinTypeModifier>();
         parser->ReadToken(TokenType::LParent);
-        modifier->tag = BaseType(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+        modifier->tag = BaseType(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
         parser->ReadToken(TokenType::RParent);
 
         return modifier;
@@ -6523,7 +6523,7 @@ namespace Slang
     {
         BuiltinRequirementModifier* modifier = parser->astBuilder->create<BuiltinRequirementModifier>();
         parser->ReadToken(TokenType::LParent);
-        modifier->kind = BuiltinRequirementKind(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+        modifier->kind = BuiltinRequirementKind(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
         parser->ReadToken(TokenType::RParent);
 
         return modifier;
@@ -6536,7 +6536,7 @@ namespace Slang
         modifier->magicName = parser->ReadToken(TokenType::Identifier).getContent();
         if (AdvanceIf(parser, TokenType::Comma))
         {
-            modifier->tag = uint32_t(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+            modifier->tag = uint32_t(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
         }
         parser->ReadToken(TokenType::RParent);
 
@@ -6547,10 +6547,10 @@ namespace Slang
     {
         IntrinsicTypeModifier* modifier = parser->astBuilder->create<IntrinsicTypeModifier>();
         parser->ReadToken(TokenType::LParent);
-        modifier->irOp = uint32_t(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+        modifier->irOp = uint32_t(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
         while( AdvanceIf(parser, TokenType::Comma) )
         {
-            auto operand = uint32_t(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+            auto operand = uint32_t(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
             modifier->irOperands.add(operand);
         }
         parser->ReadToken(TokenType::RParent);
@@ -6564,10 +6564,10 @@ namespace Slang
         ConversionCost cost = kConversionCost_Default;
         if( AdvanceIf(parser, TokenType::LParent) )
         {
-            cost = ConversionCost(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+            cost = ConversionCost(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
             if (AdvanceIf(parser, TokenType::Comma))
             {
-                builtinKind = BuiltinConversionKind(StringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
+                builtinKind = BuiltinConversionKind(stringToInt(parser->ReadToken(TokenType::IntegerLiteral).getContent()));
             }
             parser->ReadToken(TokenType::RParent);
         }
-- 
cgit v1.2.3