Skip to content

Use Cilint in CInt64 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Dec 8, 2021
Merged

Use Cilint in CInt64 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
395ad9a
Steps towards removing Cilint
michael-schwarz Dec 1, 2021
93eecd7
Make indentation less crazy
michael-schwarz Dec 1, 2021
23705af
More simplication
michael-schwarz Dec 1, 2021
1bb7140
Switch Cint64 to cilint
michael-schwarz Dec 1, 2021
d3ca4e7
Rename CInt64 -> CInt
michael-schwarz Dec 1, 2021
ddddac0
typos
michael-schwarz Dec 1, 2021
b99151a
Make pExp output consistent
michael-schwarz Dec 1, 2021
9c0efdf
Rm polymorphic compare on cilint
michael-schwarz Dec 1, 2021
f9f8e64
Slightly less bonkers indentation
michael-schwarz Dec 1, 2021
9c34b06
Simplify parseInt
michael-schwarz Dec 1, 2021
5fcf2dd
Output string in parseInt
michael-schwarz Dec 1, 2021
fae401b
Rm commented out code
michael-schwarz Dec 1, 2021
ca7c995
Make parseInt code more ordinary
michael-schwarz Dec 2, 2021
718339b
Change indent
michael-schwarz Dec 2, 2021
7066252
Add zarith to merlin file
michael-schwarz Dec 2, 2021
9ad7b51
Merge branch 'develop' into no_cilint
michael-schwarz Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .merlin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ B _build/src/ext/
B _build/src/ext/pta/
B _build/src/frontc/
B _build/src/ocamlutil/
PKG findlib
PKG findlib, zarith
10 changes: 5 additions & 5 deletions src/check.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,8 +641,8 @@ and checkInit (i: init) : typ =
match elen with
| None -> 0L
| Some e -> (ignore (checkExp true e);
match isInteger (constFold true e) with
Some len -> len
match getInteger (constFold true e) with
Some len -> Z.to_int64 len (* Z on purpose, we don't want to ignore overflows here *)
| None ->
ignore (warn "Array length is not a constant");
0L)
Expand All @@ -652,10 +652,10 @@ and checkInit (i: init) : typ =
if i > len then
ignore (warn "Wrong number of initializers in array")

| (Index(Const(CInt64(i', _, _)), NoOffset), ei) :: rest ->
if i' <> i then
| (Index(Const(CInt(i', _, _)), NoOffset), ei) :: rest ->
if Int64.compare (Z.to_int64 i') i <> 0 then
ignore (warn "Initializer for index %s when %s was expected"
(Int64.format "%d" i') (Int64.format "%d" i));
(Int64.format "%d" (Z.to_int64 i')) (Int64.format "%d" i));
checkInitType ei bt;
loopIndex (Int64.succ i) rest
| _ :: rest ->
Expand Down
Loading