Merge branch 'master' of github.com:GaloisInc/macaw

This commit is contained in:
Joe Hendrix 2017-11-22 14:08:49 -08:00
commit e0417a09a1
No known key found for this signature in database
GPG Key ID: 8DFA5FF784098C4F
3 changed files with 4 additions and 4 deletions

View File

@ -10,7 +10,7 @@ executable make_bsd_syscalls
build-depends:
base >= 4,
bytestring,
language-c <= 0.5.0,
language-c >= 0.6,
lens,
pretty,
containers,
@ -23,7 +23,7 @@ executable make_linux_syscalls
build-depends:
base >= 4,
bytestring,
language-c <= 0.5.0,
language-c >= 0.6,
lens,
pretty,
containers,

View File

@ -144,7 +144,7 @@ typeToArgType typ =
PtrType _ _ _ -> WordArgType
ArrayType _ _ _ _ -> WordArgType
FunctionType _ _ -> unhandled
TypeDefType (TypeDefRef _ (Just typ) _) _ _ -> typeToArgType typ
TypeDefType (TypeDefRef _ typ _) _ _ -> typeToArgType typ
where
unhandled = error ("Unhandled type: " ++ show (pretty typ))

View File

@ -113,7 +113,7 @@ typeToArgType typ =
PtrType _ _ _ -> WordArgType
ArrayType _ _ _ _ -> WordArgType
FunctionType _ _ -> unhandled
TypeDefType (TypeDefRef _ (Just typ) _) _ _ -> typeToArgType typ
TypeDefType (TypeDefRef _ typ _) _ _ -> typeToArgType typ
where
unhandled = error ("Unhandled type: " ++ show (pretty typ))