From 7de90c1e0b42b565a5f46e2f9f7580e1f577d414 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Fri, 7 Feb 2020 15:03:30 -0500
Subject: Code standard changes for Lexer (#1209)

* Upper camel -> lowerCamel
m_ prefix members where appropriate
_ prefix module local functions

* m_ prefix members in Lexer. Fit's standard because type has methods/ctor.
---
 source/slang/slang-preprocessor.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/source/slang/slang-preprocessor.cpp b/source/slang/slang-preprocessor.cpp
index 9b7a89ddb..2f0ee69a2 100644
--- a/source/slang/slang-preprocessor.cpp
+++ b/source/slang/slang-preprocessor.cpp
@@ -345,7 +345,7 @@ static Token AdvanceRawToken(PreprocessorInputStream* inputStream, LexerFlags le
     {
         PretokenizedInputStream* pretokenized = dynamic_cast<PretokenizedInputStream*>(inputStream);
         SLANG_ASSERT(pretokenized);
-        return pretokenized->tokenReader.AdvanceToken();
+        return pretokenized->tokenReader.advanceToken();
     }
 }
 
@@ -360,7 +360,7 @@ static Token PeekRawToken(PreprocessorInputStream* inputStream)
     {
         PretokenizedInputStream* pretokenized = dynamic_cast<PretokenizedInputStream*>(inputStream);
         SLANG_ASSERT(pretokenized);
-        return pretokenized->tokenReader.PeekToken();
+        return pretokenized->tokenReader.peekToken();
     }
 }
 
@@ -375,7 +375,7 @@ static TokenType PeekRawTokenType(PreprocessorInputStream* inputStream)
     {
         PretokenizedInputStream* pretokenized = dynamic_cast<PretokenizedInputStream*>(inputStream);
         SLANG_ASSERT(pretokenized);
-        return pretokenized->tokenReader.PeekTokenType();
+        return pretokenized->tokenReader.peekTokenType();
     }
 }
 
@@ -1036,7 +1036,7 @@ top:
 
         // We expect the reuslt of lexing to be two tokens: one for the actual value,
         // and one for the end-of-input marker.
-        if (inputStream->tokenReader.GetCount() != 2)
+        if (inputStream->tokenReader.getCount() != 2)
         {
             // We expect a token paste to produce a single token
             // TODO(tfoley): emit a diagnostic here
@@ -2035,7 +2035,7 @@ static void HandleLineDirective(PreprocessorDirectiveContext* context)
         AdvanceToken(context);
 
         // Stop overriding source locations.
-        auto sourceView = inputStream->primaryStream->lexer.sourceView;
+        auto sourceView = inputStream->primaryStream->lexer.m_sourceView;
         sourceView->addDefaultLineDirective(directiveLoc);
         return;
     }
@@ -2072,7 +2072,7 @@ static void HandleLineDirective(PreprocessorDirectiveContext* context)
         return;
     }
 
-    auto sourceView = inputStream->primaryStream->lexer.sourceView;
+    auto sourceView = inputStream->primaryStream->lexer.m_sourceView;
     sourceView->addLineDirective(directiveLoc, file, line);
 }
 
-- 
cgit v1.2.3