*scratch*.diff

--- a/src/main/antlr/Orc.g4
+++ b/src/main/antlr/Orc.g4
@@ -31,8 +31,8 @@
  */
 grammar Orc; // 2.1.0

-@header {
-package com.d360.xorc.antlr;
+@head {
+package orc.compile.antlr;
 }


@@ -130,12 +130,8 @@ declaration
  | declare_type '#'?
  ;

-declaration_expression : declaration declaration_expression?;
-declarations : declaration_expression EOF;
-
 declare_val : 'val' pattern '=' expression ;
-declare_definition : declare_definition_instance+;
-declare_definition_instance : 'def' ID=function_name type_parameters? '(' parameters? ')' return_type? guard? '=' expression ;
+declare_definition : 'def' ID=function_name type_parameters? '(' parameters? ')' return_type? guard? '=' expression ;