Tweaked float matching

Replaced the old (rather bad) float matching regular expression by a set
of two regular expressions to handle cases with or without exponants.