# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1317320218 14400
# Node ID f6bbdea030b22b54c8b195210e1bd4898d0a41a0
# Parent  7861a5fd3479c40892161cb48ed1c37079bb2309
use opt_sep instead of literal '\n' in parser rules for classdef

* oct-parse.yy (class_def, class_body, properties_block,
properties_list, methods_block, methods_list, events_block,
events_list, enum_block, enum_list): Accept opt_sep instead of literal
newline character.

diff -r 7861a5fd3479 -r f6bbdea030b2 src/oct-parse.yy
--- a/src/oct-parse.yy	Thu Sep 29 14:11:39 2011 -0400
+++ b/src/oct-parse.yy	Thu Sep 29 14:16:58 2011 -0400
@@ -1491,7 +1491,7 @@
                   { $$ = 0; }
                 ;
 
-classdef        : classdef1 '\n' class_body '\n' stash_comment classdef_end
+classdef        : classdef1 opt_sep class_body opt_sep stash_comment classdef_end
                   { $$ = 0; }
                 ;
 
@@ -1540,13 +1540,13 @@
                   { $$ = 0; }
                 | enum_block
                   { $$ = 0; }
-                | class_body '\n' properties_block
+                | class_body opt_sep properties_block
                   { $$ = 0; }
-                | class_body '\n' methods_block
+                | class_body opt_sep methods_block
                   { $$ = 0; }
-                | class_body '\n' events_block
+                | class_body opt_sep events_block
                   { $$ = 0; }
-                | class_body '\n' enum_block
+                | class_body opt_sep enum_block
                   { $$ = 0; }
                 ;
 
@@ -1555,14 +1555,14 @@
                 ;
 
 properties_block
-                : properties_beg opt_attr_list '\n' properties_list '\n' END
+                : properties_beg opt_attr_list opt_sep properties_list opt_sep END
                   { $$ = 0; }
                 ;
 
 properties_list
                 : class_property
                   { $$ = 0; }
-                | properties_list '\n' class_property
+                | properties_list opt_sep class_property
                   { $$ = 0; }
                 ;
 
@@ -1576,13 +1576,13 @@
                   { $$ = 0; }
                 ;
 
-methods_block   : methods_beg opt_attr_list '\n' methods_list '\n' END
+methods_block   : methods_beg opt_attr_list opt_sep methods_list opt_sep END
                   { $$ = 0; }
                 ;
 
 methods_list    : function
                   { $$ = 0; }
-                | methods_list '\n' function
+                | methods_list opt_sep function
                   { $$ = 0; }
                 ;
 
@@ -1590,13 +1590,13 @@
                   { $$ = 0; }
                 ;
 
-events_block    : events_beg opt_attr_list '\n' events_list '\n' END
+events_block    : events_beg opt_attr_list opt_sep events_list opt_sep END
                   { $$ = 0; }
                 ;
 
 events_list     : class_event
                   { $$ = 0; }
-                | events_list '\n' class_event
+                | events_list opt_sep class_event
                   { $$ = 0; }
                 ;
 
@@ -1608,13 +1608,13 @@
                   { $$ = 0; }
                 ;
 
-enum_block      : enum_beg opt_attr_list '\n' enum_list '\n' END
+enum_block      : enum_beg opt_attr_list opt_sep enum_list opt_sep END
                   { $$ = 0; }
                 ;
 
 enum_list       : class_enum
                   { $$ = 0; }
-                | enum_list '\n' class_enum
+                | enum_list opt_sep class_enum
                   { $$ = 0; }
                 ;