Merge dev into main

.dockerignore

@@ -0,0 +1,2 @@
+bin/
+build/

.github/workflows/workflow.yml

@@ -1,66 +1,19 @@
 name: Build and Test
-
 on:
+  workflow_dispatch:
   push:
     branches:
       - "master"
   pull_request:
 
 jobs:
- gradle:
-   runs-on: windows-2022
-   steps:
-   - uses: actions/checkout@v2
-
-   - name: Set up WSL
-     uses: Vampire/setup-wsl@v1
-
-   - uses: actions/setup-java@v2
-     with:
-       distribution: temurin
-       java-version: 17
-
-   - name: Setup Gradle
-     uses: gradle/gradle-build-action@v2
-     with:
-       gradle-version: 7.3
-
-   - name: Execute Gradle build
-     run: gradle build
-
-   - name: Install dependencies
-     shell: wsl-bash {0}
-     run: |
-       apt update
-       apt install make nasm gcc -y
-
-   - name: Run tests
-     run: gradle runTests
-
-
-  # Ubuntu workflow, something goes wrong in the test, perhaps fix in the future
-  # gradle:
-  #   runs-on: ubuntu-20.04
-  #   steps:
-  #     - uses: actions/checkout@v2
-
-  #     - uses: actions/setup-java@v2
-  #       with:
-  #         distribution: temurin
-  #         java-version: 17
-
-  #     - name: Setup Gradle
-  #       uses: gradle/gradle-build-action@v2
-  #       with:
-  #         gradle-version: 7.3
-
-  #     - name: Execute Gradle build
-  #       run: gradle build
-
-  #     - name: Install dependencies
-  #       run: |
-  #         sudo apt update
-  #         sudo apt install make nasm gcc -y
-
-  #     - name: Run tests
-  #       run: gradle runTests
+  ci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: stepchowfun/toast/.github/actions/toast@main
+        env:
+          args: -PextraArgs=export -q
+      - uses: codecov/codecov-action@v2
+        with:
+          files: coverage.json

.gitignore

@@ -142,7 +142,7 @@ project/plugins/project/
 .cache
 .lib/
 
-/compiled
+**/compiled
 /.bsp
 
 
@@ -168,4 +168,9 @@ gradle-app.setting
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
-toCompile.txt
+app/po_src
+po_src/*
+!po_src/lib
+coverage.json
+pwndbg/
+debugir

Dockerfile

@@ -0,0 +1,17 @@
+# antoniosbarotsis/posharp-veritas
+# Packages all project dependencies
+
+FROM openjdk:17-jdk-slim
+
+RUN apt-get update -y && \
+  apt-get install -y gcc make curl dos2unix lsb-release wget software-properties-common gnupg
+
+COPY llvm.sh llvm.sh
+RUN chmod +x llvm.sh
+RUN dos2unix llvm.sh
+RUN ./llvm.sh 15
+
+RUN mv /usr/bin/llc-15 /usr/bin/llc
+
+COPY *.gradle gradle.* gradlew ./
+COPY gradle/ ./gradle/

Makefile

@@ -1,27 +1,28 @@
 TARGET_FILE = 'hello'
 
-all: run
+all: run_llvm
 
 #assemble hello.asm
 build:
 	mkdir -p compiled && \
 	cd compiled/ && \
-	nasm -felf64 $(TARGET_FILE).asm && \
-	gcc -O0 -ggdb -no-pie $(TARGET_FILE).o -o $(TARGET_FILE)
-
-#compile and run asm 
-run: build
+	llc $(TARGET_FILE).ll -opaque-pointers && \
+	gcc -O0 -ggdb -no-pie $(TARGET_FILE).s -o $(TARGET_FILE)
 	compiled/$(TARGET_FILE)
 
-#compile Po# using sbt and then run it, also running the generated .asm
-full: sbt run
+#compile all files in directory
+.PHONY: build_all
+build_all:
+	bash ./build.sh
+
+build_all_llvm:
+	bash ./build-llvm.sh
 
-#compile Po# compiler
-sbt: 
-	sbt --batch -Dsbt.server.forcestart=true run
+#compile and run asm 
+run_llvm: build_all_llvm
+	compiled/$(TARGET_FILE)
 
-# for some example on the internet, the gcc compiler has issues
-standalone:
-	nasm -f elf hello.asm && ld -m elf_i386 hello.o -o hello && ./hello
+run_asm: build_all
+	compiled/$(TARGET_FILE)
 
 #valgrind --leak-check=full --track-origins=yes --dsymutil=yes ./hello

README.md

@@ -18,20 +18,20 @@
 -->
 
 <p align="center">
-    <img src='logo.png' alt="">
+    <img src='docs/logo.png' alt="">
 </p>
 
 [![Contributors][contributors-shield]][contributors-url]
 [![Issues][issues-shield]][issues-url]
 [![MIT License][license-shield]][license-url]
 [![LinkedIn][linkedin-shield]][linkedin-url]
-[![Build and Test](https://github.com/pijuskri/Po-Sharp/actions/workflows/workflow.yml/badge.svg?branch=master)](https://github.com/pijuskri/Po-Sharp/actions/workflows/workflow.yml)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pijuskri/Po-Sharp/workflow.yml?label=Build%20and%20Test&style=for-the-badge)](https://github.com/pijuskri/Po-Sharp/actions/workflows/workflow.yml)
 
 
 <h2 align="center">Po#</h2>
 <div>
   <p align="center">
-    Custom language compiler to X86_64 nasm assembly, written in Scala
+    Custom language frontend for LLVM IR, written in Scala
     <br />
     <br />
   </p>
@@ -83,36 +83,38 @@ to translate to assembly.
 
 * [Scala](https://www.scala-lang.org/)
 * [FastParse](https://github.com/com-lihaoyi/fastparse)
+* [LLVM](https://llvm.org/)
 
 <!-- GETTING STARTED -->
 ### Prerequisites
 <div id="prerequisites"></div>
 
-* [Ubuntu 18.04]() and/or [WSL](https://docs.microsoft.com/en-us/windows/wsl/install)
+* [Ubuntu 18.04 or newer]() and/or [WSL](https://docs.microsoft.com/en-us/windows/wsl/install)
 * [JDK 13+](https://www.oracle.com/java/technologies/downloads/)
-* [Scala 2.13](https://www.scala-lang.org/download/)
-* [SBT 1.6.1](https://www.scala-sbt.org/download.html)
-* [NASM](https://www.nasm.us/)
+* [Scala 2.13+](https://www.scala-lang.org/download/)
+* [JDK 11+](https://www.oracle.com/java/technologies/downloads/)
+* [Gradle 7.5](https://gradle.org/install/)
 * [GCC](https://gcc.gnu.org/)
+* [Clang 15+](https://releases.llvm.org/)
+* [LLVM 15+](https://releases.llvm.org/download.html)
 
 ### Getting Started
 <div id="getting-started"></div>
 
-Currently, I run the scala compiler through IntelliJ. The conversion from
-assembly to binary is handled by a makefile, that i run in WSL with ubuntu 18;
+1. All prerequisites should be installed and verified.
+2. Create a .txt file in ``/po_src/`` which will act as the main source file
+3. Create a main function
+4. To compile to llvm, run ```gradle app:run```
+5. To run, 
 
-There is also an option to compile with a single command using sbt. Just run `make full`
-in the main directory
-
-For now the code that is interpreted can be typed in the Main object. The assembly file
-will be generated in `compiled/hello.asm` (do not ask why I named it that).
+With gradle
+* In root directory call `make full`
 
-With IntelliJ
-* Run `Main.scala`
-* In root directory call `make`
+[//]: # (TODO Does this still work? Probably a good idea to use gradle instead)
 
-With sbt
-* In root directory call `make full`
+A [testing framework](./veritas/src/main/scala/core/) is also included in the project.
+To run the language tests do `gradle runTests`. The documentation can be found
+[here](./veritas/src/main/scala/README.md).
 
 ### Language specification
 <div id="language"></div>
@@ -150,26 +152,28 @@ def fib(n: int): int {
 * Strings
 * Enums
 * Objects
+* runtime exceptions
+* multiple files
+* lambda functions
+* Generics
 
 ### To do
 <div id="todo"></div>
 
 #### Major
 
-* Generics
-* runtime exceptions
-* Object inheritance
-* lambda functions
-* library functions
-* typeof
-* Garbage collector
-* multiple files
+* Fully functional import/export system
+* Extension methods
+* Garbage collector/manual memory
 * packages
 * File i/o
+* library functions
 * Optimisation
 
 #### Minor
 
+* Tuples
+* typeof
 * Structs
 * ref/out
 * Type alias
@@ -195,4 +199,4 @@ def fib(n: int): int {
 [forks-url]: https://github.com/github_username/repo_name/network/members
 [stars-shield]: https://img.shields.io/github/stars/github_username/repo_name.svg?style=for-the-badge
 [stars-url]: https://github.com/github_username/repo_name/stargazers
-[product-screenshot]: logo.png
+[product-screenshot]: docs/logo.png

app/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    scala
+    application
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.scala-lang:scala3-library_3:3.3.1")
+    implementation("com.lihaoyi:fastparse_3:3.0.2")
+    implementation("co.blocke:scala-reflection_3:2.0.0")
+}
+
+application {
+    mainClass.set("posharp.Main")
+}

app/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "app"