Remove unnecessary std:: qualifiers

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

diff --git a/source/glsl/tokenizer.cpp b/source/glsl/tokenizer.cpp
index b7efb8f8f9414d759c3cce3843593e14ae2a72e5..595a97abc71e28402fef288be5f7c9636bc87e28 100644 (file)
--- a/source/glsl/tokenizer.cpp
+++ b/source/glsl/tokenizer.cpp
@@ -19,7 +19,7 @@ Tokenizer::Tokenizer():
        source_end = empty.end();
 }
 
-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();
@@ -59,6 +61,7 @@ void Tokenizer::expect(const string &token)
 void Tokenizer::set_location(const Location &loc)
 {
        location = loc;
+       suppress_line_advance = true;
 }
 
 string Tokenizer::parse_token_()
@@ -92,7 +95,7 @@ void Tokenizer::preprocess()
 {
        SetForScope<deque<string> > clear_tokens(next_tokens, deque<string>());
 
-       string::const_iterator line_end = iter;
+       auto line_end = iter;
        for(; (line_end!=source_end && *line_end!='\n'); ++line_end) ;
        SetForScope<string::const_iterator> stop_at_line_end(source_end, line_end);
 
@@ -133,7 +136,9 @@ string Tokenizer::parse_number()
        }
 
        bool require_digit = false;
-       if(iter!=source_end && (*iter=='e' || *iter=='E'))
+       if(iter==source_end)
+               ;
+       else if(*iter=='e' || *iter=='E')
        {
                number += *iter++;
                if(iter!=source_end && (*iter=='-' || *iter=='+'))
@@ -149,11 +154,15 @@ string Tokenizer::parse_number()
                        else
                                break;
                }
+               if(!require_digit && iter!=source_end && *iter=='f')
+                       number += *iter++;
        }
+       else if(*iter=='u' || *iter=='f')
+               number += *iter++;
 
        if(require_digit)
                throw syntax_error(location, number, "Incomplete numeric literal");
-       else if(isalnum(*iter) || *iter=='_')
+       else if(iter!=source_end && (isalnum(*iter) || *iter=='_'))
                throw syntax_error(location, number, "Garbage at end of numeric literal");
 
        return number;