Support attr as X.X
Fix grammar

Fix attr token;
Ignore whitespace;