HLSL: Move to correct parsing of annotations, improving all annotations and recent string grammar.
diff --git a/hlsl/hlslTokens.h b/hlsl/hlslTokens.h
index 9e23cc7..e38cb9a 100755
--- a/hlsl/hlslTokens.h
+++ b/hlsl/hlslTokens.h
@@ -70,10 +70,10 @@
     EHTokBuffer,
     EHTokVector,
     EHTokMatrix,
-    EHTokString,
 
     // scalar types
     EHTokVoid,
+    EHTokString,
     EHTokBool,
     EHTokInt,
     EHTokUint,