Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Princess-org/Princess
Browse files Browse the repository at this point in the history
  • Loading branch information
Victorious3 committed Nov 24, 2023
2 parents c33aea2 + 6e1e9e2 commit 701a986
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Princess
<img src="https://raw.githubusercontent.com/Princess-org/vscode-Princess/7d8a22d355a42f6c04401421898cf6c0fcc50732/icons/crown.svg" width="120" align="left"/>

# Princess
![Build Status](https://github.com/Princess-org/Princess/actions/workflows/build-and-test.yml/badge.svg)
![Build on Windows](https://github.com/Princess-org/Princess/actions/workflows/windows.yml/badge.svg)

Expand All @@ -8,7 +10,13 @@ https://princess.sh
Site hosted by github-pages. Source over at https://github.com/Princess-org/Princess-org.github.io

## Build instructions
Note: The linux release does only work properly on Ubuntu 20.04 and derivatives, due to its dependencies.

<s>Note: The linux release does only work properly on Ubuntu 20.04 and derivatives, due to its dependencies.</s>

There is now a bootstrap compiler provided on the releases page. This compiler doesn't have any dependencies (except clang >= 13) and is statically linked using MUSL.
In order to use it you need to download the .tar.gz file, extract it and place `princess` in the bin directory. The other alternative is cloning the repo and doing the same there.

Building the bootstrap compiler is not very straight forward but will eventually be handled by the CI process.

There is a native Windows version, but for working on the compiler it is recommended to use
WSL in order to get a Linux environment. This is because the tests currently don't run on Windows since
Expand All @@ -21,7 +29,6 @@ $ pip install -r requirements.txt

In order to bootstrap the compiler simply run:
```
$ ./build.py download
$ ./build.py -p
```

Expand Down
2 changes: 1 addition & 1 deletion build.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python3.9
#!/usr/bin/python3

import json
from os import system
Expand Down
4 changes: 2 additions & 2 deletions include/gencstd.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/python3.9
#!/usr/bin/python3

from abc import ABC, abstractmethod
from dataclasses import dataclass
Expand Down Expand Up @@ -665,4 +665,4 @@ def main():
process_module("windows", "User32.lib", "Kernel32.lib", "Dbghelp.lib")

if __name__ == "__main__":
main()
main()
5 changes: 3 additions & 2 deletions src/repl.pr
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ def read_input {

while lines[line][column - 1] & 0b11000000 == 0b10000000 {
column -= 1
lines[line].remove(column)
lines[line] = lines[line].remove(column)
}
column -= 1
lines[line].remove(column)
lines[line] = lines[line].remove(column)

if column < lines[line].length {
print("\x1B7")
Expand Down Expand Up @@ -235,6 +235,7 @@ def read_input {
}
}
history[history_item] = lines[line]
fflush(std::stdout())
}

var br = false
Expand Down

0 comments on commit 701a986

Please sign in to comment.