Makes each primitive rule define its own return value.
A number is float or integer.
Merge pull request #3 from tonchis/refactoring_primitive_types

Refactoring primitive types