From 50d1bb2c41c2d188aad0a202b0413a5f5cc536bb Mon Sep 17 00:00:00 2001
From: Sei Lisa <sei-lisa@email.fake>
Date: Fri, 1 Aug 2014 17:57:55 +0200
Subject: [PATCH] Bug fix: Error on existing events in current state.

---
 lslopt/lslparse.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lslopt/lslparse.py b/lslopt/lslparse.py
index 612d90b..79bdc69 100644
--- a/lslopt/lslparse.py
+++ b/lslopt/lslparse.py
@@ -1467,17 +1467,20 @@ class parser(object):
         while self.tok[0] == 'EVENT_NAME':
             name = self.tok[1]
             self.NextToken()
+            if name in self.localevents:
+                raise EParseAlreadyDefined(self)
+            self.localevents.add(name)
             self.expect('(')
             self.NextToken()
             # Function parameters go to a dedicated symbol table.
             self.PushScope()
             params = self.Parse_optional_param_list()
+            self.expect(')')
+            self.NextToken()
             # NOTE: Parse_events: This is a bit crude, as the error is given at the end of the param list.
             # To do it correctly, we can pass the parameter list to Parse_optional_param_list().
             if tuple(params[0]) != self.events[name]:
                 raise EParseSyntax(self)
-            self.expect(')')
-            self.NextToken()
             self.locallabels = set()
             body = self.Parse_code_block(None)
             del self.locallabels
@@ -1608,7 +1611,9 @@ class parser(object):
             self.expect('{')
             self.NextToken()
 
+            self.localevents = set()
             events = self.Parse_events()
+            del self.localevents
 
             self.expect('}')
             self.tree.append({'nt':'STDEF', 't':None, 'name':name, 'scope':0, 'ch':events})