diff -r c02710a8bac4 -r 69cc0166be8d tools/pas2c.hs --- a/tools/pas2c.hs Thu Apr 19 18:15:03 2012 +0200 +++ b/tools/pas2c.hs Thu Apr 19 23:36:20 2012 +0400 @@ -234,8 +234,10 @@ where f :: TypeVarDeclaration -> State RenderState [(String, BaseType)] f (VarDeclaration _ (ids, td) _) = mapM (\(Identifier i _) -> liftM ((,) i) $ resolveType td) ids -resolveType (ArrayDecl (Just _) t) = liftM (BTArray BTInt) $ resolveType t -resolveType (ArrayDecl Nothing t) = liftM (BTArray BTInt) $ resolveType t +resolveType (ArrayDecl (Just i) t) = do + t' <- resolveType t + return $ BTArray i BTInt t' +resolveType (ArrayDecl Nothing t) = liftM (BTArray RangeInfinite BTInt) $ resolveType t resolveType (FunctionType t _) = liftM BTFunction $ resolveType t resolveType (DeriveType (InitHexNumber _)) = return BTInt resolveType (DeriveType (InitNumber _)) = return BTInt @@ -382,13 +384,23 @@ _ -> error $ "InitRange identifier: " ++ i' _ -> error $ "InitRange: " ++ show r initExpr2C (InitRange (RangeFromTo (InitNumber "0") r)) = initExpr2C $ BuiltInFunction "succ" [r] +initExpr2C (InitRange (RangeFromTo (InitChar "0") (InitChar r))) = initExpr2C $ BuiltInFunction "succ" [InitNumber r] initExpr2C (InitRange a) = error $ show a --return $ text "<>" initExpr2C (InitSet []) = return $ text "0" initExpr2C (InitSet a) = return $ text "<>" initExpr2C (BuiltInFunction "low" [InitReference e]) = return $ case e of (Identifier "LongInt" _) -> int (-2^31) - _ -> error $ show e + (Identifier "SmallInt" _) -> int (-2^15) + _ -> error $ "BuiltInFunction 'low': " ++ show e +initExpr2C (BuiltInFunction "high" [e]) = do + initExpr2C e + t <- gets lastType + case t of + (BTArray i _ _) -> initExpr2C $ BuiltInFunction "pred" [InitRange i] + a -> error $ "BuiltInFunction 'high': " ++ show a +initExpr2C (BuiltInFunction "succ" [BuiltInFunction "pred" [e]]) = initExpr2C e +initExpr2C (BuiltInFunction "pred" [BuiltInFunction "succ" [e]]) = initExpr2C e initExpr2C (BuiltInFunction "succ" [e]) = liftM (<> text " + 1") $ initExpr2C e initExpr2C (BuiltInFunction "pred" [e]) = liftM (<> text " - 1") $ initExpr2C e initExpr2C b@(BuiltInFunction _ _) = error $ show b @@ -573,7 +585,7 @@ t <- gets lastType ns <- gets currentScope case t of - (BTArray _ t') -> modify (\st -> st{lastType = t'}) + (BTArray _ _ t') -> modify (\st -> st{lastType = t'}) (BTString) -> modify (\st -> st{lastType = BTChar}) (BTPointerTo t) -> do t'' <- fromPointer (show t) =<< gets lastType