--- a/ciena.grammar	Thu Dec 03 18:37:47 2009 +0100
+++ b/ciena.grammar	Fri Dec 18 14:16:48 2009 +0100
@@ -24,7 +24,7 @@
 # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
-<autotree>
+#<autotree>
 { # perl code follows
 
 $::res = {};
@@ -91,7 +91,7 @@
 
 emptyline:	eol
 
-comment: 	/^\!.*/ eol
+comment: 	/^\!.*/ #eol
 
 cmdline:	l_hostname
 		| l_port
@@ -104,9 +104,9 @@
 		| l_vc
 		| l_vs
 		| l_vlan
-		| word(s) eol
+		| word(s) #eol
 
-word:		/[0-9a-zA-Z:\/_\#\"\.,-]+/
+word:		/[0-9a-zA-Z:\/_\#\"\.\$,+<>=-]+/
 		{ $item[1] }
 
 identifier:	/[0-9a-zA-Z:_-]+/