Merge pull request #202 from boriel/feature/new_opt_peephole

Feature/new opt peephole

Author: boriel

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 1.8.10
+current_version = 1.9.0
 files = version.py
 

Changelog.md

@@ -1,7 +1,17 @@
+[v1.9.0](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.10)
+===
++ New and completely refactored optimizer which now allow patterns.<br />
+  This new optimizer (after a year of hard work) not only optimizes better,<br />
+  it also allows to specify new optimization patterns without touching the compiler code.
++ New optimizer level -O4 (peephole)
++ zxbasm (assembler) now allows several instructions per line using `:`
++ zxbasm allows labels to be declared without using colon.
++ Some other little optimizationn
+
 [v1.8.10](https://bitbucket.org/zxbasic/zxbasic/commits/tag/v1.8.10)
 ===
 + ! Bugfix: `FLASH 8` and `BRIGHT 8` were not working correctly. Fixed.
-+ Changelog file renamed to `Changelog.md` and renoved. Now uses Markdown.
++ Changelog file renamed to `Changelog.md` and renovated. Now uses Markdown.
 + `PLOT`, `DRAW` and `CIRCLE` now do not use the ROM for ATTR (no ROM dependency)
 + ! Bugfix: Setting multiple `ORG` within ASM blocks crashed the compiler. Fixed.
 + Change code style to pass more flake8 tests

api/errmsg.py

@@ -25,13 +25,22 @@ def msg_output(msg):
     global_.error_msg_cache.add(msg)
 
 
-def syntax_error(lineno, msg):
+def info(msg):
+    if OPTIONS.Debug.value < 1:
+        return
+    OPTIONS.stderr.value.write("info: %s\n" % msg)
+
+
+def syntax_error(lineno, msg, fname=None):
     """ Generic syntax error routine
     """
+    if fname is None:
+        fname = global_.FILENAME
+
     if global_.has_errors > OPTIONS.max_syntax_errors.value:
         msg = 'Too many errors. Giving up!'
 
-    msg = "%s:%i: %s" % (global_.FILENAME, lineno, msg)
+    msg = "%s:%i: %s" % (fname, lineno, msg)
     msg_output(msg)
 
     if global_.has_errors > OPTIONS.max_syntax_errors.value:
@@ -40,10 +49,13 @@ def syntax_error(lineno, msg):
     global_.has_errors += 1
 
 
-def warning(lineno, msg):
+def warning(lineno, msg, fname=None):
     """ Generic warning error routine
     """
-    msg = "%s:%i: warning: %s" % (global_.FILENAME, lineno, msg)
+    if fname is None:
+        fname = global_.FILENAME
+
+    msg = "%s:%i: warning: %s" % (fname, lineno, msg)
     msg_output(msg)
     global_.has_warnings += 1
 

identityset.py api/identityset.pyidentityset.py renamed to api/identityset.py

@@ -2,32 +2,31 @@
 # -*- coding: utf-8 -*-
 # vim:ts=4:et:
 
-import collections
-
 
 class IdentitySet(object):
     """ This set implementation only adds items
     if they are not exactly the same (same reference)
     preserving its order (OrderedDict). Allows deleting by ith-index.
     """
-    def __init__(self, l=None):
+    def __init__(self, elems=None):
         self.elems = []
         self._elems = set()
-        if l is not None:
-            self.add(l)
+        self.update(elems or [])
 
-    def add(self, l):
-        if not isinstance(l, collections.Iterable):
-            l = [l]
-        self.elems.extend(x for x in l if x not in self._elems)
-        self._elems.update(x for x in l)
+    def add(self, elem):
+        self.elems.append(elem)
+        self._elems.add(elem)
 
-    def remove(self, l):
-        if not isinstance(l, collections.Iterable):
-            l = [l]
+    def remove(self, elem):
+        """ Removes an element if it exits. Otherwise does nothing.
+        Returns if the element was removed.
+        """
+        if elem in self._elems:
+            self._elems.remove(elem)
+            self.elems = [x for x in self.elems if x in self._elems]
+            return True
 
-        self._elems.difference_update(l)
-        self.elems = [x for x in self.elems if x not in self._elems]
+        return False
 
     def __len__(self):
         return len(self.elems)
@@ -45,11 +44,16 @@ def __delitem__(self, key):
         self.pop(self.elems.index(key))
 
     def intersection(self, other):
-        return IdentitySet([x for x in self.elems if x in self._elems.intersection(other)])
+        return IdentitySet(self._elems.intersection(other))
 
     def union(self, other):
         return IdentitySet(self.elems + [x for x in other])
 
     def pop(self, i):
-        tmp = self.elems.pop(i)
-        self._elems.remove(tmp)
+        result = self.elems.pop(i)
+        self._elems.remove(result)
+        return result
+
+    def update(self, elems):
+        self.elems.extend(x for x in elems if x not in self._elems)
+        self._elems.update(x for x in elems)