libcommon|HexLex: Cleanup

skyjake · Jan 25, 2014 · d738c53 · d738c53
1 parent 2c8a931
commit d738c53
Showing 1 changed file with 21 additions and 23 deletions.
diff --git a/doomsday/plugins/common/src/hexlex.cpp b/doomsday/plugins/common/src/hexlex.cpp
@@ -71,10 +71,10 @@ HexLex::~HexLex()
 
 void HexLex::parse(Str const *script)
 {
-    _script       = script;
-    _readPos      = 0;
-    _lineNumber   = 1;
-    _alreadyGot   = false;
+    _script     = script;
+    _readPos    = 0;
+    _lineNumber = 1;
+    _alreadyGot = false;
     Str_Clear(&_token);
 }
 
@@ -181,19 +181,22 @@ bool HexLex::readToken()
     return true;
 }
 
-Str const *HexLex::readString()
+void HexLex::unreadToken()
 {
-    if(!readToken())
+    if(_readPos == 0)
     {
-        syntaxError("Missing string");
+        return;
     }
+    _alreadyGot = true;
+}
+
+Str const *HexLex::token()
+{
     return &_token;
 }
 
 int HexLex::readNumber()
 {
-    checkOpen();
-
     if(!readToken())
     {
         syntaxError("Missing integer");
@@ -210,30 +213,25 @@ int HexLex::readNumber()
     return number;
 }
 
-Uri *HexLex::readUri(char const *defaultScheme)
+Str const *HexLex::readString()
 {
     if(!readToken())
     {
-        syntaxError("Missing uri");
+        syntaxError("Missing string");
     }
-
-    Uri *uri = Uri_SetScheme(Uri_New(), defaultScheme);
-    Uri_SetPath(uri, Str_Text(Str_PercentEncode(AutoStr_FromTextStd(Str_Text(&_token)))));
-    return uri;
+    return &_token;
 }
 
-void HexLex::unreadToken()
+Uri *HexLex::readUri(char const *defaultScheme)
 {
-    if(_readPos == 0)
+    if(!readToken())
     {
-        return;
+        syntaxError("Missing uri");
     }
-    _alreadyGot = true;
-}
 
-Str const *HexLex::token()
-{
-    return &_token;
+    Uri *uri = Uri_SetScheme(Uri_New(), defaultScheme);
+    Uri_SetPath(uri, Str_Text(Str_PercentEncode(AutoStr_FromTextStd(Str_Text(&_token)))));
+    return uri;
 }
 
 int HexLex::lineNumber() const