suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

occam BYTE is unsigned -- use uint8_t

Browse Source
This commit is contained in:
Adam Sampson 2007-04-30 19:49:08 +00:00
parent db8782dfcf
commit b3b17f7611
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fco2/GenerateC.hs
View File

@ -122,8 +122,7 @@ genName n = tell [[if c == '.' then '_' else c | c <- A.nameName n]]
--{{{ types --{{{ types
scalarType :: A.Type -> Maybe String scalarType :: A.Type -> Maybe String
scalarType A.Bool = Just "bool" scalarType A.Bool = Just "bool"
-- FIXME: This probably isn't right; we might have to explicitly cast string literals... scalarType A.Byte = Just "uint8_t"
scalarType A.Byte = Just "char"
scalarType A.Int = Just "int" scalarType A.Int = Just "int"
scalarType A.Int16 = Just "int16_t" scalarType A.Int16 = Just "int16_t"
scalarType A.Int32 = Just "int32_t" scalarType A.Int32 = Just "int32_t"

18
fco2/tock_support.h
View File

@ -17,8 +17,8 @@
//{{{ mostneg/mostpos //{{{ mostneg/mostpos
#define occam_mostneg_bool false #define occam_mostneg_bool false
#define occam_mostpos_bool true #define occam_mostpos_bool true
#define occam_mostneg_char CHAR_MIN #define occam_mostneg_uint8_t 0
#define occam_mostpos_char CHAR_MAX #define occam_mostpos_uint8_t UINT8_MAX
#define occam_mostneg_int INT_MIN #define occam_mostneg_int INT_MIN
#define occam_mostpos_int INT_MAX #define occam_mostpos_int INT_MAX
#define occam_mostneg_int16_t INT16_MIN #define occam_mostneg_int16_t INT16_MIN
@ -112,13 +112,13 @@ static int occam_check_index (int i, int limit, const char *pos) {
return a % b; \ return a % b; \
} }
//{{{ char //{{{ uint8_t
MAKE_RANGE_CHECK(char, "%d") MAKE_RANGE_CHECK(uint8_t, "%d")
MAKE_ADD(char) MAKE_ADD(uint8_t)
MAKE_SUBTR(char) MAKE_SUBTR(uint8_t)
MAKE_MUL(char) MAKE_MUL(uint8_t)
MAKE_DIV(char) MAKE_DIV(uint8_t)
MAKE_REM(char) MAKE_REM(uint8_t)
//}}} //}}}
//{{{ int16_t //{{{ int16_t
MAKE_RANGE_CHECK(int16_t, "%d") MAKE_RANGE_CHECK(int16_t, "%d")