From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
Date: Sat, 19 Mar 2022 17:39:38 +0000 (+0000)
Subject: d63b05
X-Git-Tag: archive/raspbian/1.0.0-16+rpi1~2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=34d15b1415a572c1481cbe66b2e7e5da0aca1fe5;p=hedgewars.git

d63b05

# HG changeset patch
# User unc0rr
# Date 1603217384 -7200
# Node ID 036263d63b05e954624444d32c5116c2329bce80
# Parent  82fd124e6512b0a89162ae984ff908306455703f
Fix lack of declaration decorations for dynamic arrays in Pas2C


Gbp-Pq: Name 036263d63b05.patch
---

diff --git a/tools/pas2c/Pas2C.hs b/tools/pas2c/Pas2C.hs
index 8aaf6c1..36e079c 100644
--- a/tools/pas2c/Pas2C.hs
+++ b/tools/pas2c/Pas2C.hs
@@ -574,10 +574,7 @@ tvar2C _ _ _ _ (VarDeclaration True _ (ids, t) Nothing) = do
     liftM (map(\i -> t' i)) $ mapM (id2CTyped2 (Just $ t' empty) (VarParamType t)) ids
 
 tvar2C _ externVar includeType ignoreInit (VarDeclaration _ isConst (ids, t) mInitExpr) = do
-    t' <- liftM (((if isConst then text "static const" else if externVar
-                                                                then text "extern"
-                                                                else empty)
-                   <+>) . ) $ type2C t
+    t' <- liftM ((declDetails <+>) . ) $ type2C t
     ie <- initExpr mInitExpr
     lt <- gets lastType
     case (isConst, lt, ids, mInitExpr) of
@@ -602,12 +599,15 @@ tvar2C _ externVar includeType ignoreInit (VarDeclaration _ isConst (ids, t) mIn
                     where
                         arrayDimStr = show $ arrayDimension t
                         arrayDimInitExp = text ("={" ++ ".dim = " ++ arrayDimStr ++ ", .a = {0, 0, 0, 0}}")
-                        dimDecl = varDeclDecision isConst includeType (text "fpcrtl_dimension_t" <+>  i' <> text "_dimension_info") arrayDimInitExp
+                        dimDecl = varDeclDecision isConst includeType (declDetails <+> text "fpcrtl_dimension_t" <+>  i' <> text "_dimension_info") arrayDimInitExp
 
                 (_, _) -> return result
 
          _ -> liftM (map(\i -> varDeclDecision isConst includeType (t' i) ie)) $ mapM (id2CTyped2 (Just $ t' empty) t) ids
     where
+    declDetails = if isConst then text "static const" else if externVar
+                                                            then text "extern"
+                                                            else empty
     initExpr Nothing = return $ empty
     initExpr (Just e) = liftM (text "=" <+>) (initExpr2C e)
     varDeclDecision True True varStr expStr = varStr <+> expStr