diff options
| author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
|---|---|---|
| committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
| commit | 8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch) | |
| tree | 812fe2f7ec68c03c5f0762f1266f383193bbfe92 /flocq/Flocq_version.v | |
| parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
| parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
| download | compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip | |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'flocq/Flocq_version.v')
| -rw-r--r-- | flocq/Flocq_version.v | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/flocq/Flocq_version.v b/flocq/Flocq_version.v index d2d9d3fb..c391f590 100644 --- a/flocq/Flocq_version.v +++ b/flocq/Flocq_version.v @@ -25,7 +25,8 @@ Definition Flocq_version := Eval vm_compute in let fix parse s major minor := match s with | String "."%char t => parse t (major * 100 + minor)%N N0 - | String h t => parse t major (minor + N_of_ascii h - N_of_ascii "0"%char)%N + | String h t => + parse t major (minor * 10 + N_of_ascii h - N_of_ascii "0"%char)%N | Empty_string => (major * 100 + minor)%N end in - parse "2.4.0"%string N0 N0. + parse "2.5.0"%string N0 N0. |