Fold type conversions of constants

[libs/gl.git] / source / glsl / tokenizer.cpp

diff --git a/source/glsl/tokenizer.cpp b/source/glsl/tokenizer.cpp
index e73afd5273add2dec2f907f223b2b1e5421b9f9d..0b18245f0e323e66c9c2eef6fb40ff19ba8307dc 100644 (file)
--- a/source/glsl/tokenizer.cpp
+++ b/source/glsl/tokenizer.cpp
@@ -11,15 +11,15 @@ namespace GL {
 namespace SL {
 
 Tokenizer::Tokenizer():
-       allow_preprocess(true)
+       allow_preprocess(true),
+       suppress_line_advance(false)
 {
        static string empty;
        iter = empty.begin();
        source_end = empty.end();
-       location.line = 0;
 }
 
-void Tokenizer::begin(const string &name, const string &src)
+void Tokenizer::begin(const string &src, const string &name)
 {
        iter = src.begin();
        source_end = src.end();
@@ -34,11 +34,13 @@ const string &Tokenizer::peek_token(unsigned index)
 {
        while(next_tokens.size()<=index)
                next_tokens.push_back(parse_token_());
-       return (last_token = next_tokens[index]);
+       return next_tokens[index];
 }
 
 const string &Tokenizer::parse_token()
 {
+       progress_mark = true;
+
        if(!next_tokens.empty())
        {
                last_token = next_tokens.front();
@@ -56,6 +58,12 @@ void Tokenizer::expect(const string &token)
                throw parse_error(location, parsed, format("'%s'", token));
 }
 
+void Tokenizer::set_location(const Location &loc)
+{
+       location = loc;
+       suppress_line_advance = true;
+}
+
 string Tokenizer::parse_token_()
 {
        while(1)
@@ -74,7 +82,9 @@ string Tokenizer::parse_token_()
                        return parse_identifier();
                else if(isdigit(*iter))
                        return parse_number();
-               else if(*iter=='"' || *iter=='#' || *iter=='$' || *iter=='\'' || *iter=='@' || *iter=='\\' || *iter=='`')
+               else if(*iter=='"')
+                       return parse_string();
+               else if(*iter=='#' || *iter=='$' || *iter=='\'' || *iter=='@' || *iter=='\\' || *iter=='`')
                        throw syntax_error(location, string(1, *iter), "Invalid character in source");
                else
                        return parse_other();
@@ -152,6 +162,25 @@ string Tokenizer::parse_number()
        return number;
 }
 
+string Tokenizer::parse_string()
+{
+       string str(1, *iter++);
+       bool escape = false;
+       while(iter!=source_end)
+       {
+               char c = *iter++;
+               str += c;
+               if(c=='\\')
+                       escape = true;
+               else if(c=='"' && !escape)
+                       break;
+               else
+                       escape = false;
+       }
+
+       return str;
+}
+
 string Tokenizer::parse_other()
 {
        if(iter==source_end)
@@ -219,12 +248,15 @@ void Tokenizer::skip_comment_and_whitespace()
 
                if(*iter=='\n')
                {
-                       ++location.line;
+                       if(!suppress_line_advance)
+                               ++location.line;
                        allow_preprocess = (comment<3);
                }
 
                ++iter;
        }
+
+       suppress_line_advance = false;
 }
 
 } // namespace SL