Add header into intellisence, fix parsing invalid operands

ifj2017/ide/assets/styles/UIStyles.qml

@@ -17,6 +17,7 @@ QtObject {
             typeColors[0] = "#00bff2"
             typeColors[1] = "#ffe20d"
             typeColors[2] = "white"
+            typeColors[3] = "orange"
         }
     }
 }

ifj2017/ide/code_analyzer.py

@@ -1,6 +1,7 @@
 # coding=utf-8
 import re
 from typing import Optional
+
 from PyQt5.QtCore import QObject, QVariant, pyqtProperty, pyqtSignal
 from PyQt5.QtQml import QQmlEngine, QJSEngine
 
@@ -31,6 +32,11 @@ def code(self, v: str) -> None:
     def completerModel(self) -> QVariant:
         return QVariant(
             [
+                dict(
+                    identifier='.IFJcode17',
+                    type=Expression.ExpressionTypes.Header
+                )
+            ] if '.IFJcode17' not in self.code else [] + [
                 dict(
                     identifier=match,
                     type=Expression.ExpressionTypes.Types

ifj2017/ide/settings.py

@@ -15,6 +15,7 @@ class ExpressionTypes(IntEnum):
         Instruction = 0
         Variable = 1
         Types = 2
+        Header = 3
 
     Q_ENUMS(ExpressionTypes)
 

ifj2017/interpreter/operand.py

@@ -65,13 +65,15 @@ def __init__(self, value):
 
         raise InvalidCodeException(InvalidCodeException.INVALID_OPERAND)
 
-
     def _resolve_constant(self, constant_match):
         # type: (Match) -> None
         type_, value = constant_match.groups()
-        self.value = self.CONSTANT_MAPPING.get(type_.lower())(value)
-        if type_.lower() == self.CONSTANT_MAPPING_REVERSE.get(bool):
-            self.value = self.BOOL_LITERAL_MAPPING.get(value.lower())
+        try:
+            self.value = self.CONSTANT_MAPPING.get(type_.lower())(value)
+            if type_.lower() == self.CONSTANT_MAPPING_REVERSE.get(bool):
+                self.value = self.BOOL_LITERAL_MAPPING.get(value.lower())
+        except ValueError:
+            pass
         if self.value is None:
             raise InvalidCodeException(type_=InvalidCodeException.INVALID_OPERAND)
         self.type = TypeOperand.CONSTANT

setup.py

@@ -32,7 +32,7 @@
 def setup():
     core.setup(
         name='IFJcode17-toolkit',
-        version='1.1.4',
+        version='1.1.6',
         license='GNU GENERAL PUBLIC LICENSE Version 3',
         description='Toolkit for IFJ17 language compiler (as project at FIT BUT in Brno) with '
                     'interactive debugger and automatic tests.',