Sorted out logging

3 files changed, 11 insertions, 4 deletions

diff --git a/src/pclc/parser/helpers.py b/src/pclc/parser/helpers.py
index 36c2485..a13fedc 100644
--- a/src/pclc/parser/helpers.py
+++ b/src/pclc/parser/helpers.py
@@ -23,7 +23,7 @@ from pcl_lexer import PCLLexer
 from pcl_parser import PCLParser
 
 logging.basicConfig(
-    level = logging.DEBUG,
+    level = logging.WARNING,
     filename = "pclc.log",
     filemode = "w",
     format = "%(asctime)s: %(levelname)s: %(filename)s at line %(lineno)d: %(message)s",
@@ -32,7 +32,7 @@ logging.basicConfig(
 logger = logging.getLogger()
 
 def parse_component(filename):
-    lexer = PCLLexer(debug = 1, debuglog = logger)
+    lexer = PCLLexer(logger, debug = 1)
     parser = PCLParser(lexer, logger, debug = 1, write_tables = 0)
     ast = parser.parseFile(filename)
 
diff --git a/src/pclc/parser/pcl_lexer.py b/src/pclc/parser/pcl_lexer.py
index 7fbdcc3..4e5ed88 100644
--- a/src/pclc/parser/pcl_lexer.py
+++ b/src/pclc/parser/pcl_lexer.py
@@ -108,7 +108,11 @@ class PCLLexer(object):
               (t.value[0], self.__lexer.lineno)
         t.lexer.skip(1)
 
-    def __init__(self, **kwargs):
+    def __init__(self, logger = None, **kwargs):
+        if 'debuglog' not in kwargs:
+            kwargs['debuglog'] = logger
+        if 'errorlog' not in kwargs:
+            kwargs['errorlog'] = logger
         self.__lexer = lex.lex(module = self, **kwargs)
 
     def input(self, input):
diff --git a/src/pclc/parser/pcl_parser.py b/src/pclc/parser/pcl_parser.py
index ddb661a..258a549 100644
--- a/src/pclc/parser/pcl_parser.py
+++ b/src/pclc/parser/pcl_parser.py
@@ -307,7 +307,10 @@ class PCLParser(object):
     def __init__(self, lexer, logger, **kwargs):
         self.__lexer = lexer
         self.__logger = logger
-        kwargs['debuglog'] = logger
+        if 'debuglog' not in kwargs:
+            kwargs['debuglog'] = logger
+        if 'errorlog' not in kwargs:
+            kwargs['errorlog'] = logger
         self.__parser = yacc.yacc(**kwargs)
 
     def parseFile(self, filename, **kwargs):