Added missing value splitting rule.
added roll/unroll in the grammar and statics