Merge pull request #5 from Conqu3red/improvements

classes

Author: two-cats-in-a-trenchcoat

.github/workflows/test_examples.yml

@@ -0,0 +1,31 @@
+name: Test example files
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Test examples
+      working-directory: ./src
+      run: |
+        python test_examples.py
+      

.gitignore

@@ -8,4 +8,5 @@ dist
 win-src/*.py
 !ECPUser.py
 *.exe
-executables/ecp
+executables/ecp
+*.zip

examples/class_test.ecp

@@ -0,0 +1,30 @@
+CLASS a
+
+    temp := 1
+
+    SUBROUTINE INIT()
+        this.b := 0
+    ENDSUBROUTINE
+
+    SUBROUTINE STR()
+        RETURN "<aaa>"
+    ENDSUBROUTINE
+
+    SUBROUTINE REPR()
+        RETURN this.STR()
+    ENDSUBROUTINE
+
+    SUBROUTINE inc_b(value)
+        this.b := this.b + value
+    ENDSUBROUTINE
+ENDCLASS
+
+instance := a()
+OUTPUT instance
+OUTPUT [instance, "aa"]
+
+OUTPUT "b", instance.b
+instance.inc_b(1)
+OUTPUT "b", instance.b
+
+OUTPUT "base", a.temp

src/ecp.py

@@ -1,4 +1,4 @@
-__version__ = "1.0.0-alpha"
+__version__ = "1.1.1-beta"
 from lexer import *
 from parse import *
 import argparse

src/lexer.py

@@ -49,6 +49,7 @@ class TokenType(Enum):
     STRING = "STRING"
     ARRAY = "ARRAY"
     BUILTIN_FUNCTION = "BUILTIN_FUNCTION"
+    SUBROUTINE = "SUBROUTINE"
 
     ID = "ID"
     KEYWORD = "KEYWORD"
@@ -67,6 +68,7 @@ class TokenType(Enum):
     CONSTANT = "CONSTANT"
     TRY = "TRY"
     CATCH = "CATCH"
+    CLASS = "CLASS"
     RECORD = "RECORD"
 
 class Token:
@@ -130,12 +132,13 @@ def __repr__(self):
     #"SQRT",
 ]
 keywords = {
-    "SUBROUTINE": TokenType.KEYWORD, 
+    "SUBROUTINE": TokenType.SUBROUTINE, 
     "ENDSUBROUTINE": TokenType.KEYWORD, 
     "RETURN": TokenType.MAGIC,
     "CONTINUE": TokenType.MAGIC,
     "BREAK": TokenType.MAGIC,
     "OUTPUT": TokenType.MAGIC,
+    "USERINPUT": TokenType.MAGIC,
     "False": TokenType.BOOLEAN,
     "True": TokenType.BOOLEAN,
 
@@ -162,6 +165,8 @@ def __repr__(self):
     "TRY": TokenType.TRY,
     "CATCH": TokenType.CATCH,
     "ENDTRY": TokenType.KEYWORD,
+    "CLASS": TokenType.CLASS,
+    "ENDCLASS": TokenType.KEYWORD,
 }
 
 types = {