Merge pull request #43 from stormprograms/dev

StormScript v0.5.0

CMakeLists.txt

@@ -5,14 +5,13 @@ add_executable(stormscript
     src/core/stormscript.cc
     src/core/set.cc
     src/core/errors.cc
-    src/core/runlibfunc.cc
     src/parser/parse.cc
     src/parser/read.cc
-    src/parser/modules.cc
     src/interpreter/globscope.cc
     src/interpreter/exec.cc
     src/stream/io.cc
     src/stream/stsstream.cc
+    src/stream/loops.cc
     src/values/stsdec.cc
     src/values/man.cc
     src/values/if.cc
@@ -23,5 +22,5 @@ add_executable(stormscript
     src/classes/dectype.cc
     src/classes/decmethod.cc)
 set (StormScript_VERSION_MAJOR 0)
-set (StormScript_VERSION_MINOR 4)
-install(TARGETS stormscript RUNTIME DESTINATION bin/)
+set (StormScript_VERSION_MINOR 5)
+install(TARGETS stormscript RUNTIME DESTINATION bin/)

README.md

@@ -8,43 +8,6 @@
 
 [![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/stormscript)
 
-## How to Build
+StormScript is a programming language made in C++
 
-Terminal:
-
-To build StormScript clone this repository and cd into it. Run 
-```
-$ cmake CMakeLists.txt
-```
-and
-```
-$ make
-```
-You can then add it to path or install it to /usr/bin.
-
-Visual Studio Code:
-
-Clone this repository like before and open it in Visual Studio Code. Make sure you have the CMake, C++, and python plugins installed. Press `Build:` in the bottom left or press `f5` to start debugging.
-
-When it builds, it should be put into a `build/` directory.
-
-## Layout
-
-Folder | Description
------- | -----------
-docs/ | contributing guide, code of conduct. etc.
-src/core/ | The core StormScript files
-src/stream/ | Files that deal with the console.
-build-scripts/ | Scripts to be packaged with releases
-src/classes/ | Files that deal with classes.
-src/values/ | Files that deal with variables and functions.
-tests/ | Files for testing that core functionality is not messed up.
-
-## Files You Should Know
-
-file | Description
----- | -----------
-[src/core/stormscript.cc](src/core/stormscript.cc) | This is where files are read.
-[src/core/errors.cc](src/core/errors.cc) | This is where all new errors are added.
-[src/parser/parse.cc](src/parser/parse.cc) | This is the parser.
-[src/interpreter/exec.cc](src/interpreter/exec.cc) | This is the function that interprets functions
+Read [building.md](docs/building.md) for info on how to build

azure-pipelines.yml

@@ -13,5 +13,8 @@ steps:
 - script: |
     cmake CMakeLists.txt;
     make;
+    mkdir build;
+    mv stormscript build;
+    cd scripts;
     ./runtests.sh
   displayName: 'make'

build-scripts/install.sh

@@ -1,17 +1,7 @@
 #!/bin/bash
-cmake CMakeLists.txt
+cmake CMakeLists.txt -DCMAKE_CXX_COMPILER:STRING="g++"
 make
 sudo cp stormscript /usr/bin
-g++ src/libraries/system/reader.cc -o src/libraries/system/system.stslib 
-g++ src/libraries/random/reader.cc -o src/libraries/random/random.stslib 
 
-if [ ! -e ~/.stormscript ]; then
-    mkdir ~/.stormscript
-    echo 'export PATH=$PATH:'$HOME'/.stormscript' >> ~/.bashrc
-fi
-
-cp src/libraries/*/*.stslib ~/.stormscript
-cp src/libraries/*/*.py ~/.stormscript
-cp -r api/python/stormscript ~/.stormscript
 stormscript finished.sts
 exec bash

build-scripts/uninstall.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 sudo rm /usr/bin/stormscript
-sudo rm -rf $HOME/.stormscript
 echo StormScript Removed

docs/building.md

@@ -0,0 +1,33 @@
+# Building StormScript
+
+Make a directory called build
+
+You must have gcc installed (MinGW for Windows) and CMake
+
+## Linux
+
+Terminal:
+
+To build StormScript clone this repository and cd into it. Run 
+```
+$ cmake CMakeLists.txt
+```
+and
+```
+$ make
+```
+You can then add it to path or install it to /usr/bin.
+
+## Windows
+
+Make sure you have MinGW-make installed
+
+Run CMake GUI, and configure for MinGW-make
+
+output should be a MakeFile, run mingw-make in that directory.
+
+## Visual Studio Code
+
+Clone this repository like before and open it in Visual Studio Code. Make sure you have the CMake, C++, and python plugins installed. Press `Build:` in the bottom left or press `f5` to start debugging.
+
+When it builds, it should be put into a `build/` directory.

docs/changelogs/changelog-v0.5.0.md

@@ -0,0 +1,12 @@
+# StormScript v0.5.0 "Eggplant"
+
+## What's New
+* `while` can be used to make while loops
+* New Escape Characters, `\t` and `\\`
+* Windows version
+* Modules have been removed due to compatibility issues
+* Libraries have been removed due to compatibility issues
+* New scripts folder for build scripts
+
+## What's Fixed
+* `runtests.sh` will now exit with code 1 on failure

docs/readme.md

@@ -1,13 +1,5 @@
 # About
 
-## Table of Contents
-* [Why is this special?](#why-is-this-special)
-* [How to Build](#how-to-build)
-* [Layout](#layout)
-* [Files You Should Know](#files-you-should-know)
-
-## Why is this special?
-
 StormScript is important not because it presents 1 or 2 revolutionary ideas that change your usual workflow, but because it changes almost everything about common programming syntax to make it easier to read and write. **This may seem more like a problem at first,** but I believe that StormScript changes programming syntax *for the better.* Here are a few examples:
 
 1. Keywords
@@ -33,7 +25,7 @@ do{
   f => x: "hi";
 }
 ```
-Another example of this is the `|` symbol, which is usually used as a separator. In StormScript, the `|` symbol tells the intepreter to find a property. For example:
+Another example of this is the `|` symbol, which is usually used as a separator. In StormScript, the `|` symbol tells the interpreter to find a property. For example:
 
 ```
 type person{
@@ -54,4 +46,4 @@ do{
 }
 
 ```
-In  StormScript, the `is` keyword replaces the `==` symbol and `not` replaces the `!=` symbol.
+In StormScript, the `is` keyword replaces the `==` symbol and `not` replaces the `!=` symbol.

example/example.sts

@@ -1,12 +1,8 @@
 do{
-    x: 4;
-    printl "Hello, World!";
-
-    if x is 3 {
-        printl "hi";
-    }else if x is 4 {
-        printl "hi there";
-    }else {
-        printl "bye";
+    x: 3;
+    y: 10;
+    while x not y {
+        x+: 1;
+        printl x;
     }
 }

packagerelease.sh → scripts/packagerelease.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
+cd ..
 rm -r release/*
 echo "What is the version number (Formatted M.m.p):"
 read vnum
 
 echo "Packaging stormscript v$vnum for release."
 
-cmake CMakeLists.txt
+cmake CMakeLists.txt -DCMAKE_CXX_COMPILER:STRING="g++"
 make
 install stormscript build/stormscript
 rm stormscript
@@ -42,7 +43,6 @@ cd stormscript_v$vnum
 
 cp ../../CMakeLists.txt .
 cp -r ../../src .
-cp -r ../../api .
 cp ../../build-scripts/* .
 
 echo "Compressing folder stormscript_v$vnum."

runtests.sh → scripts/runtests.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+cd ..
 cmake CMakeLists.txt
 make
 install stormscript build/stormscript
@@ -29,7 +30,7 @@ for i in $( ls | grep .sts ); do
     else
         echo Test $B failed:
         echo expected$'\n'$(echo `cat outputs/$i.txt`)$'\n'got$'\n'$(echo `../build/stormscript $i`)
-        break
+        exit 1
     fi
 
     B=$(($B+1))

writenewouts.sh → scripts/writenewouts.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+cd ..
 cmake CMakeLists.txt
 make
 install stormscript build/stormscript

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: stormscript # you probably want to 'snapcraft register <name>'
-version: 'v0.4.1' # just for humans, typically '1.2+git' or '1.3.2'
+version: 'v0.5.0' # just for humans, typically '1.2+git' or '1.3.2'
 summary: StormScript is an easy to use, open-source scripting language  # 79 char long summary
 description: |
   StormScript is an open source scripting language. StormScript was created on the belief that a good scripting language can be both powerful and easily readable and learnable.