Current changes to the grammar.

Prevented adding null expressions to a function in ScalrParser2.jj. Added a null check to Function.java as well. Currently working with NoteOps to get a functional note.