# HG changeset patch
# User unc0rr
# Date 1334948216 -14400
# Node ID 23b38e530967bff68e5b5946fb46577f54cc31df
# Parent  31def088a87041d83ee62b19f0b2aae457ba3318
Move all strings into constants to make them of string255 type

diff -r 31def088a870 -r 23b38e530967 hedgewars/pas2c.h
--- a/hedgewars/pas2c.h	Fri Apr 20 22:03:35 2012 +0400
+++ b/hedgewars/pas2c.h	Fri Apr 20 22:56:56 2012 +0400
@@ -2,9 +2,15 @@
 
 #include <stdbool.h>
 
-typedef struct string255_
+typedef union string255_
     {
-        char s[256];
+        struct {
+            char s[256];
+        };
+        struct {
+            char len;
+            char str[255];
+        };
     } string255;
 typedef struct string192_
     {
@@ -53,3 +59,4 @@
 string255 copy(string255 a, int s, int l);
 string255 delete(string255 a, int s, int l);
 
+#define STRCONSTDECL(a, b) const string255 a = {.len = sizeof(b), .str = b}
diff -r 31def088a870 -r 23b38e530967 tools/pas2c.hs
--- a/tools/pas2c.hs	Fri Apr 20 22:03:35 2012 +0400
+++ b/tools/pas2c.hs	Fri Apr 20 22:56:56 2012 +0400
@@ -31,10 +31,36 @@
         currentScope :: [Record],
         lastIdentifier :: String,
         lastType :: BaseType,
+        stringConsts :: [(String, String)],
+        uniqCounter :: Int,
         namespaces :: Map.Map String [Record]
     }
     
-emptyState = RenderState [] "" BTUnknown
+emptyState = RenderState [] "" BTUnknown [] 0
+
+getUniq :: State RenderState Int
+getUniq = do
+    i <- gets uniqCounter
+    modify(\s -> s{uniqCounter = uniqCounter s + 1})
+    return i
+    
+addStringConst :: String -> State RenderState Doc
+addStringConst str = do
+    i <- getUniq
+    let sn = "__str" ++ show i
+    modify (\s -> s{stringConsts = (sn, str) : stringConsts s})
+    return $ text sn
+    
+escapeStr :: String -> String
+escapeStr = foldr escapeChar []
+
+escapeChar :: Char -> ShowS
+escapeChar '"' s = "\\\"" ++ s
+escapeChar a s = a : s
+
+renderStringConsts :: State RenderState Doc
+renderStringConsts = liftM (vcat . map (\(a, b) -> text "STRCONSTDECL" <> parens (text a <> comma <+> doubleQuotes (text $ escapeStr b)) <> semi)) 
+    $ gets stringConsts
     
 docToLower :: Doc -> Doc
 docToLower = text . map toLower . render
@@ -94,7 +120,11 @@
 withState' f sf = do
     st <- liftM f get
     let (a, s) = runState sf st
-    modify(\st -> st{lastType = lastType s})
+    modify(\st -> st{
+        lastType = lastType s
+        , uniqCounter = uniqCounter s
+        , stringConsts = stringConsts s
+        })
     return a
 
 withLastIdNamespace :: State RenderState Doc -> State RenderState Doc
@@ -148,7 +178,11 @@
 interface2C (Interface uses tvars) = liftM2 ($+$) (uses2C uses) (typesAndVars2C True tvars)
 
 implementation2C :: Implementation -> State RenderState Doc
-implementation2C (Implementation uses tvars) = liftM2 ($+$) (uses2C uses) (typesAndVars2C True tvars)
+implementation2C (Implementation uses tvars) = do
+    u <- uses2C uses
+    tv <- typesAndVars2C True tvars
+    r <- renderStringConsts
+    return (u $+$ r $+$ tv)
 
 
 typesAndVars2C :: Bool -> TypesAndVars -> State RenderState Doc
@@ -561,7 +595,7 @@
 expr2C (FloatLiteral s) = return $ text s
 expr2C (HexNumber s) = return $ text "0x" <> (text . map toLower $ s)
 expr2C (StringLiteral [a]) = return . quotes $ text [a]
-expr2C (StringLiteral s) = return $ doubleQuotes $ text s 
+expr2C (StringLiteral s) = addStringConst s
 expr2C (Reference ref) = ref2C ref
 expr2C (PrefixOp op expr) = liftM (text (op2C op) <>) (expr2C expr)
 expr2C Null = return $ text "NULL"