diff options
| author | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
|---|---|---|
| committer | Jacques-Henri Jourdan <jacques-henri.jourdan@inria.fr> | 2015-11-04 03:04:21 +0100 |
| commit | 5664fddcab15ef4482d583673c75e07bd1e96d0a (patch) | |
| tree | 878b22860e69405ba5cf6fd2798731dac8ce660c /flocq/Flocq_version.v | |
| parent | b960c83725d7e185ac5c6e3c0d6043c7dcd2f556 (diff) | |
| parent | fe73ed58ef80da7c53c124302a608948fb190229 (diff) | |
| download | compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.tar.gz compcert-5664fddcab15ef4482d583673c75e07bd1e96d0a.zip | |
Merge remote-tracking branch 'origin/master' into parser_fix
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. |