Skip to content

Commit 586f24c

Browse files
authored
Merge development into main
Merge pull request #2 from iiPythonx/devel
2 parents ae291c2 + 35ffaeb commit 586f24c

File tree

776 files changed

+496
-237487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

776 files changed

+496
-237487
lines changed

.gitignore

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
1+
# Hide cache
12
__pycache__/
23

3-
# Pyinstaller build files
4-
dist/
5-
build/
6-
*.spec
7-
8-
# Installer data
9-
package.zip
10-
.installer_cache
11-
124
# Hide x2 testing files
13-
*.x2
5+
*.xpp

main.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

main.x2

Lines changed: 0 additions & 1 deletion
This file was deleted.

main.xpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
var woah "hello world"
2-
:: starting from 0
3-
prt (chr woah 2) (chr woah 8)
4-
prt (chr woah 2 8)
1+
var y 1
2+
rep 5 loop y ?y
3+
prt y
4+
5+
:loop x
6+
ret (add x 1)

md/documents.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [x2](../README.md) / Documents
1+
# [x++](../README.md) / Documents
22

33
## Table of Contents
44

@@ -21,9 +21,9 @@
2121

2222
## About
2323

24-
Welcome to the documents page of the official x2 documentation. In this section, you will be learning about the individual components that make up x2.
24+
Welcome to the documents page of the official x++ documentation. In this section, you will be learning about the individual components that make up x++.
2525

26-
If you are looking for a beginner's guide for x2, check out the [tutorials](./tutorials.md) instead.
26+
If you are looking for a beginner's guide for x++, check out the [tutorials](./tutorials.md) instead.
2727

2828
## Documents
2929

@@ -40,4 +40,4 @@ If you are looking for a beginner's guide for x2, check out the [tutorials](./tu
4040

4141
Last Updated: February 6th, 2022 by Dm123321_31mD
4242

43-
[↑ Go To Top](#x2--documents)
43+
[↑ Go To Top](#x--documents)

md/documents/comments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [x2](../../README.md) / [Documents](../documents.md) / Comments
1+
# [x++](../../README.md) / [Documents](../documents.md) / Comments
22

33
## Table of Contents
44

@@ -37,4 +37,4 @@ out 5 :: This is a comment
3737

3838
Last Updated: February 6th, 2022 by Dm123321_31mD
3939

40-
[↑ Go To Top](#x2--documents--comments)
40+
[↑ Go To Top](#x--documents--comments)

md/documents/comparators.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [x2](../../README.md) / [Documents](../documents.md) / Comparators
1+
# [x++](../../README.md) / [Documents](../documents.md) / Comparators
22

33
## Table of Contents
44

@@ -55,9 +55,9 @@
5555

5656
## About
5757

58-
Comparators are symbols or keywords that compare two different variables or values and trigger a branch in the x2 thread. Each comparator has its functionality.
58+
Comparators are symbols or keywords that compare two different variables or values and trigger a branch in the x++ thread. Each comparator has its functionality.
5959

60-
Expressions are segments in the code that creates a branch in the x2 thread. They are always made up of three components: the `source`, the `comparator`, and the `target`, and they are arranged like so:
60+
Expressions are segments in the code that creates a branch in the x++ thread. They are always made up of three components: the `source`, the `comparator`, and the `target`, and they are arranged like so:
6161

6262
```xt
6363
<source> <comparator> <target>
@@ -302,4 +302,4 @@ cmp 5 from int "out \"true\""
302302

303303
Last Updated: February 6th, 2022 by Dm123321_31mD
304304

305-
[↑ Go To Top](#x2--documents--comparators)
305+
[↑ Go To Top](#x--documents--comparators)

md/documents/configurations.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [x2](../../README.md) / [Documents](../documents.md) / Configurations
1+
# [x++](../../README.md) / [Documents](../documents.md) / Configurations
22

33
## Table of Contents
44

@@ -62,9 +62,9 @@ The configuration file can also contain non-essential information, such as the a
6262
"contributors": [
6363
"contributor A", "contributor B"
6464
],
65-
"description": "This is my x2 project",
65+
"description": "This is my x++ project",
6666
"main": "main.xt",
67-
"name": "my-x2-project",
67+
"name": "my-x++-project",
6868
"version": "1.0.0"
6969
}
7070
```
@@ -105,4 +105,4 @@ Throws errors silently.
105105

106106
Last Updated: February 6th, 2022 by Dm123321_31mD
107107

108-
[↑ Go To Top](#x2--documents--configurations)
108+
[↑ Go To Top](#x--documents--configurations)

md/documents/dataTypes.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [x2](../../README.md) / [Documents](../documents.md) / Data Types
1+
# [x++](../../README.md) / [Documents](../documents.md) / Data Types
22

33
## Table of Contents
44

@@ -50,9 +50,9 @@
5050

5151
Data types are classifications of variables or values. Each data type can only store a specific type of value. For example, a string cannot contain an integer value, or a boolean cannot contain a string value.
5252

53-
Because x2 is a dynamic programming language, you can change the data type of a variable or a value during run-time.
53+
Because x++ is a dynamic programming language, you can change the data type of a variable or a value during run-time.
5454

55-
x2 is also a weakly-typed programming language. You do not (and cannot) directly specify what the data type of a variable or value is. The interpreter will read the value and determine the data type during run-time.
55+
x++ is also a weakly-typed programming language. You do not (and cannot) directly specify what the data type of a variable or value is. The interpreter will read the value and determine the data type during run-time.
5656

5757
Strongly-typed language, such as [Java](https://en.wikipedia.org/wiki/Java_(programming_language)):
5858

@@ -66,7 +66,7 @@ Weakly-typed language, such as [JavaScript](https://en.wikipedia.org/wiki/JavaSc
6666
let myInteger = 5;
6767
```
6868

69-
Similarly, in x2, you define a variable with a data type of an integer like so:
69+
Similarly, in x++, you define a variable with a data type of an integer like so:
7070

7171
```xt
7272
psh 5 myInteger
@@ -78,7 +78,7 @@ psh 5 myInteger
7878

7979
A boolean value represents either `true` or `false`.
8080

81-
Currently, it is impossible to get a boolean value within vanilla x2. Because of that, integers are used instead to represent a true or false value, where `1` represents `true` and `0` represents `false`.
81+
Currently, it is impossible to get a boolean value within vanilla x++. Because of that, integers are used instead to represent a true or false value, where `1` represents `true` and `0` represents `false`.
8282

8383
---
8484

@@ -130,7 +130,7 @@ psh 05 myInteger
130130
out myInteger
131131
```
132132

133-
In vanilla x2, it can also be used as a boolean value, where `1` represents `true` and `0` represents `false`:
133+
In vanilla x++, it can also be used as a boolean value, where `1` represents `true` and `0` represents `false`:
134134

135135
```xt
136136
psh 0 hamburgerIsEaten
@@ -143,7 +143,7 @@ evl hamburgerIsEaten == 1 "out \"Someone ate my hamburger\""
143143

144144
Null is a data type that represents nothing.
145145

146-
It cannot be defined normally in x2 and acts as the default value to undefined variables:
146+
It cannot be defined normally in x++ and acts as the default value to undefined variables:
147147

148148
```xt
149149
out nonexistingVariable
@@ -207,7 +207,7 @@ Below is a list of all the escape codes for reference:
207207

208208
> Source: [Python DS - Python 3 Escape Sequences](https://www.python-ds.com/python-3-escape-sequences)
209209
210-
You can also string interpolation within an x2 string. All string interpolations must be a valid x2 statement and be surrounded by `$()`:
210+
You can also string interpolation within an x++ string. All string interpolations must be a valid x++ statement and be surrounded by `$()`:
211211

212212
```xt
213213
psh 5 myInteger
@@ -226,4 +226,4 @@ cmp "abc" < "cba" "out \"true\""
226226

227227
Last Updated: February 6th, 2022 by Dm123321_31mD
228228

229-
[↑ Go To Top](#x2--documents--data-types)
229+
[↑ Go To Top](#x--documents--data-types)

0 commit comments

Comments
 (0)