Merging Final Changes

.deepsource.toml

@@ -1,6 +1,6 @@
 version = 1
 
-exclude_patterns = ["**/antlrgen/*","**/BitVector.py"]
+exclude_patterns = ["lfr/antlrgen/**.*","**/BitVector.py"]
 
 [[analyzers]]
 name = "python"

.devcontainer/Dockerfile

@@ -1,44 +1,29 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.166.1/containers/ubuntu/.devcontainer/base.Dockerfile
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.194.3/containers/ubuntu/.devcontainer/base.Dockerfile
 
-# [Choice] Ubuntu version: bionic, focal
+# [Choice] Ubuntu version: hirsute, bionic, focal
 ARG VARIANT="focal"
 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
-# FROM ubuntu:20.04
 
 ENV   PYTHONFAULTHANDLER=1 \
   PYTHONUNBUFFERED=1 \
   PYTHONHASHSEED=random \
   PIP_NO_CACHE_DIR=off \
-  # PIP_DISABLE_PIP_VERSION_CHECK=on \
+  PIP_DISABLE_PIP_VERSION_CHECK=on \
   PIP_DEFAULT_TIMEOUT=100 \
-  POETRY_VERSION=1.0.0
+  POETRY_VERSION=1.2.0
 
 
 # [Optional] Uncomment this section to install additional OS packages.
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && sudo apt-get update \  
-  && apt-get -y install --no-install-recommends build-essential curl software-properties-common \
-  python3-pip  git make build-essential python-dev libssl-dev zlib1g-dev \ 
-  libbz2-dev libreadline-dev libsqlite3-dev curl libffi-dev \
-  graphviz libgraphviz-dev \
-  libcairo2-dev pkg-config python3-dev
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends curl build-essential \
+      software-properties-common python3-pip make build-essential \
+      python-dev libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
+      libsqlite3-dev curl libffi-dev redis-server openjdk-8-jre-headless \
+      graphviz libgraphviz-dev libcairo2-dev pkg-config python3-dev python3.8-venv \
+      python3-setuptools liblzma-dev \
+      python3-pygraphviz apt-utils
+
+# RUN poetry config virtualenvs.create false
+RUN pip install --upgrade pip
+RUN pip install setuptools pygraphviz
 
-# Things that didn't install -  make python3-dev
-
-# Install and setup pyenv 
-RUN git clone git://github.com/yyuu/pyenv.git .pyenv
-RUN git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
-
-ENV HOME  /
-ENV PYENV_ROOT $HOME/.pyenv
-ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
-
-RUN pyenv install 3.8.0
-RUN pyenv global 3.8.0
-
-RUN pip install pygraphviz
-
-RUN pip install "poetry==$POETRY_VERSION"
-
-RUN poetry config virtualenvs.create false
-ENV PYTHONPATH=${PYTHONPATH}:${PWD} 

.devcontainer/devcontainer.json

@@ -5,23 +5,35 @@
   "build": {
     "dockerfile": "Dockerfile",
     // Update 'VARIANT' to pick an Ubuntu version: focal, bionic
-    "args": { "VARIANT": "focal" }
+    "args": {
+      "VARIANT": "focal"
+    }
   },
-
   // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash"
-  },
-
   // Add the IDs of extensions you want installed when the container is created.
-  "extensions": ["ms-python.vscode-pylance", "ms-python.python","njpwerner.autodocstring","bungcip.better-toml", "rkrishnasanka.lfr", "rkrishnasanka.uf"]
-
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.vscode-pylance",
+        "ms-python.python",
+        "njpwerner.autodocstring",
+        "bungcip.better-toml",
+        "rkrishnasanka.lfr",
+        "rkrishnasanka.uf",
+        "LittleFoxTeam.vscode-python-test-adapter"
+      ]
+    }
+  },
+  "features": {
+    "ghcr.io/devcontainers-contrib/features/black:2": {},
+    "ghcr.io/devcontainers-contrib/features/isort:2": {},
+    "ghcr.io/devcontainers-contrib/features/poetry:2": {},
+    "ghcr.io/devcontainers-contrib/features/pylint:2": {}
+  },
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
-
   // Use 'postCreateCommand' to run commands after the container is created.
   // "postCreateCommand": "uname -a",
-
   // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  // "remoteUser": "vscode"
-}
+  "remoteUser": "root"
+}

.gitattributes

@@ -0,0 +1 @@
+*.pdf binary

.gitignore

@@ -130,10 +130,11 @@ dmypy.json
 
 # Output
 out/
+output/
 
 .idea/
 .antlr/
 Verilog2001.g4
 
 *.old
-pre_processor_dump.lfr
+pre_processor_dump.lfr

.gitmodules

@@ -1,3 +1,12 @@
-[submodule "test"]
-	path = test
-	url = https://github.com/CIDARLAB/LFR-TestCases.git
+[submodule "pymint"]
+	path = pymint
+	url = https://github.com/cidarlab/pymint
+	branch = master
+[submodule "pyparchmint"]
+	path = pyparchmint
+	url = https://github.com/cidarlab/pyparchmint
+	branch = master
+[submodule "dafd"]
+	path = dafd
+	url = https://github.com/rkrishnasanka/dafd
+	branch = master

.vscode/launch.json

@@ -74,6 +74,8 @@
             "args": [
                 "--outpath",
                 "./out/",
+                "--technology",
+                "dropx",
                 "${file}"
             ],
             "console": "integratedTerminal"
@@ -91,6 +93,21 @@
             ],
             "console": "integratedTerminal"
         },
+        {
+            "name": "Debug - Customfile, NO GEN (with distribute library)",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}/lfr/cmdline.py",
+            "args": [
+                "--no-gen",
+                "--outpath",
+                "./out/",
+                "--pre-load",
+                "../LFR-Testcases/distribute-library",
+                "${file}"
+            ],
+            "console": "integratedTerminal"
+        },
         {
             "name": "Debug - CLI TEST",
             "type": "python",

.vscode/settings.json

@@ -1,12 +1,20 @@
 {
-  "python.linting.flake8Enabled": true,
+  "python.linting.flake8Enabled": false,
   "python.linting.enabled": true,
-  "python.linting.flake8Args": ["--max-line-length=88", "--ignore=E203"],
+  "python.linting.flake8Args": [
+    "--max-line-length=88",
+    "--ignore=E203"
+  ],
   "python.formatting.provider": "black",
   "editor.formatOnSave": true,
-  "python.linting.pylintEnabled": false,
+  "python.linting.pylintEnabled": true,
   "python.formatting.blackArgs": [
     "--line-length=88",
     "--experimental-string-processing"
-  ]
-}
+  ],
+  "python.testing.pytestArgs": [
+    "tests"
+  ],
+  "python.testing.unittestEnabled": false,
+  "python.testing.pytestEnabled": true,
+}

README.md

@@ -1,4 +1,4 @@
-# LFR
+# LFR <img align="right" src="LFR-Logo-01.png" width="250">
 
 ## Dependencies 
 
@@ -8,8 +8,16 @@ LFR requires the user to install graphviz onto the system for the pygraphviz dep
 
 We need ANTLR for generating the listener. Install ANTLR4 from the [website](https://www.antlr.org/index.html)
 
+### LFR Grammar
+
+```
+antlr4 -o ./lfr/antlrgen/lfr -listener -visitor -Dlanguage=Python3 -lib . ./lfrX.g4
+```
+
+### Reggie(Graph Match) Grammar
+
 ```
-antlr4 -o ./lfr/antlrgen -listener -visitor -Dlanguage=Python3 -lib . ./lfrX.g4
+antlr4 -o ./lfr/antlrgen/reggie -listener -visitor -Dlanguage=Python3 -lib . ./reggie.g4
 ```
 
 ### Graphviz