Merge pull request #73 from mithro/file-fix

Fix pip breaking `file:` support.

.github/workflows/check-install.yml

@@ -40,13 +40,13 @@ jobs:
 
     - name: Install pip+wheel
       run: |
-        pip install --upgrade wheel
-        pip install --upgrade pip
+        python -m pip install --user --upgrade wheel
+        python -m pip install --user --upgrade pip
 
     - name: Test installation
       shell: bash
       run: |
-        pip install git+https://github.com/${GITHUB_REPOSITORY}.git@${GITHUB_SHA}#egg=fasm
+        python -m pip install git+https://github.com/${GITHUB_REPOSITORY}.git@${GITHUB_SHA}#egg=fasm
 
     - name: Run Smoke Test
       run: |

.github/workflows/presubmit.yml

@@ -19,7 +19,7 @@ jobs:
           sudo apt update
           sudo apt install clang-format
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          python -m pip install -r requirements.txt
       - name: Python style check
         run: |
           make format lint
@@ -66,7 +66,7 @@ jobs:
           sudo apt update
           sudo apt install cmake default-jre-headless uuid-dev libantlr4-runtime-dev
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          python -m pip install -r requirements.txt
           python update_version.py
       - name: Tox
         run: ANTLR4_RUNTIME_TYPE=${{ matrix.antlr_runtime_type }} tox -e ${{ matrix.TOXENV }}

.github/workflows/publish-to-pypi.yml

@@ -31,8 +31,8 @@ jobs:
 
     - name: Install build dependencies
       run: |
-        pip install -U pip
-        pip install -r requirements.txt
+        python -m pip install -U pip
+        python -m pip install -r requirements.txt
         python update_version.py
 
     - name: Install package dependencies
@@ -89,8 +89,8 @@ jobs:
 
     - name: Install build dependencies
       run: |
-        pip install -U pip
-        pip install twine auditwheel
+        python -m pip install -U pip
+        python -m pip install twine auditwheel
         python update_version.py
 
     - name: 🚧 Build distribution 📦
@@ -181,8 +181,8 @@ jobs:
 
     - name: Install build dependencies
       run: |
-        pip install -U pip
-        pip install -r requirements.txt
+        python -m pip install -U pip
+        python -m pip install -r requirements.txt
         python update_version.py
 
     - name: Install package dependencies

environment.yml

@@ -5,4 +5,4 @@ dependencies:
   - python
   - swig
   - pip:
-    - -r file:requirements.txt
+    - -r requirements.txt

src/ParseFasm.cpp

@@ -210,7 +210,7 @@ class FasmParserBaseVisitor : public FasmParserVisitor {
         virtual Any visitFasmFile(
             FasmParser::FasmFileContext* context) override {
                 for (auto& line : context->fasmLine()) {
-                        std::string str = visit(line);
+                        std::string str = visit(line).as<std::string>();
                         if (!str.empty()) {
                                 out << str;
                                 if (hex_mode)