Merge pull request #11 from blazingkin/development

Release 2.3

Author: blazingkin

.gitignore

@@ -2,8 +2,9 @@
 *.gen
 .metadata/*
 .recommenders/*
+.settings/*
 *.project
 *.class
 *.classpath
-CHANGELOG
-ExampleCode2.blz
+*.outran
+CHANGELOG

.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,5 @@
+This is mostly outdated, the language website will have a much cleaner version of this soon
+
 Key -
 @ - Deprecated
 

Descriptions of Each Instruction.txt Docs/Descriptions of Each Instruction.txt

@@ -1,3 +1,5 @@
+This is mostly outdated, the language website will have a much cleaner version of this soon
+
 **** FOR THIS DOCUMENT ONLY ****
 {variable replaced strings are put in curly brackets}
 [a variable address are put in square brackets]

Instruction Syntax.txt Docs/Instruction Syntax.txt

@@ -0,0 +1,14 @@
+:main
+	echo "Enter a number:"
+	nin first
+	echo "Enter a number:"
+	nin second
+	echo "The sum of these numbers is:"
+	sum = sum(first, second)
+	echo sum
+end
+
+:sum(a, b)
+	result = a + b
+	return result
+end

Examples/AddTwoNumbers.blz

@@ -0,0 +1,13 @@
+:main
+	echo "What number would you like the factorial of?"
+	nin input
+	fact = fact(input)
+	echo fact
+end
+
+:fact(num)
+	if num == 0
+		return 1
+	end
+	return num * fact(num - 1)
+end

Examples/Factorial.blz

@@ -1,17 +1,14 @@
 :main
 	echo "How many fibbonacci numbers do you want?"
 	nin iter
-	a[0] = 1
-	a[1] = 1
-	for i = 2, i < iter, i = i + 1
-		ind1 = i - 1
-		ind2 = i - 2
-		a[i] = a[ind1] + a[ind2]
+	a = [1,1]
+	for i = 2; i < iter; i++
+		a[i] = a[i - 1] + a[i - 2]
 	end
 
 	echo "Printing fibbonacci numbers 1-" iter
 
-	for i = 0, i < iter, i = i + 1
+	for i = 0; i < iter; i++
 		echo a[i]
 	end
 end

Examples/Fibbonacci.blz

@@ -2,7 +2,7 @@
 	echo "Enter a number"
 	nin a
 	starttime = {system.time.currenttimemillis}
-	for i = 0, i < a, i = i + 1
+	for i = 0; i < a; i = i + 1
 		echo i
 	end
 	time = {system.time.currenttimemillis} - starttime

Examples/LoopDemo.blz

@@ -1,7 +1,7 @@
 :main
 	echo "How many interations?"
 	nin iter
-	for i=0, i<iter, i=i+1
+	for i=0; i<iter; i=i+1
 		echo i
 	end 
 end

Examples/PrintLotsOfThings.blz

@@ -4,27 +4,31 @@
 	echo "How many primes do you want?"
 	nin count
 
+	start_time = {system.time.currenttimemillis}
 	while len < count
-		flag = 0
-		for i = 0, i < len, i = i + 1
+		flag = false
+		for i = 0; i < len; i = i + 1
 			if numon % primes[i] == 0	# If a previous prime divides it, it isn't a prime
-				flag = 1
+				flag = true
 				break
 			end
 		end
 		numon = numon + 1
-		if flag == 1	# Non-prime
+		if flag	# Non-prime
 			continue
 		end
 		primes[len] = numon - 1	# We incremented numon earlier, so we need to subtract one
 		len = len + 1
 	end
-	
+	end_time = {system.time.currenttimemillis}
 
 	# Loop through and print primes
-	for i = 0, i < count, i = i + 1
+	for i = 0; i < count; i = i + 1
 		off = i + 1
 		echo off "th prime: " primes[i]
 	end
+	
+	time = (end_time - start_time) / 1000
+	echo "Took " time " seconds"
 
 end

Examples/primes.blz

@@ -0,0 +1,56 @@
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.
+
+0. Additional Definitions.
+As used herein, �this License� refers to version 3 of the GNU Lesser General Public License, and the �GNU GPL� refers to version 3 of the GNU General Public License.
+
+�The Library� refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.
+
+An �Application� is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.
+
+A �Combined Work� is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the �Linked Version�.
+
+The �Minimal Corresponding Source� for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.
+
+The �Corresponding Application Code� for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.
+
+1. Exception to Section 3 of the GNU GPL.
+You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.
+
+2. Conveying Modified Versions.
+If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:
+
+a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
+b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
+3. Object Code Incorporating Material from Library Header Files.
+The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:
+
+a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
+b) Accompany the object code with a copy of the GNU GPL and this license document.
+4. Combined Works.
+You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:
+
+a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
+b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
+c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
+d) Do one of the following:
+0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
+1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
+e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
+5. Combined Libraries.
+You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:
+
+a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
+b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
+6. Revised Versions of the GNU Lesser General Public License.
+The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License �or any later version� applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.
+
+If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.

Extras/license.txt

@@ -6,24 +6,10 @@ Currently implemented in Java, but will eventually transition to being a directl
 
 The language will change drastically right now as I build up feature-completeness and polish it.
 
-Hello World Sample
+Language Hompage
 ===
 
-:main
-
-ECHO "Hello World!"
-
-END
-
-or
-
-:main
-
-(ECHO "Hello World")
-
-END
-
-*See the examples folder for more*
+Check out the language homepage at [blazingk.in/blz-ospl](http://blazingk.in/blz-ospl).
 
 
 Dependencies:
@@ -57,12 +43,20 @@ How to setup and use:
 
 Where INSTALLDIRECTORY is the directory where you saved the project
 
-4.) From the terminal, run
+4.) Reload your bash profile
+
+> $ source ~/.bashrc
+
+5.) From the terminal, run
 
 > $ blz-ospl ExampleCode.blz
 
 Contact and License
 ===
 For more information concerning this project, please email me at blazingkin [at] gmail [dot] com or visit [my website](http://www.blazingk.in/)
 
-Copyright © 2017 Alex Gravenor under the GNU GPL V2 License
+This work includes a [Java BigMath library by Richard Mathar](https://arxiv.org/abs/0908.3030v3). It is in the org folder.
+
+See the Extras folder for the full license
+
+Copyright © 2017 Alex Gravenor under the GNU GPL V3 License

README.md

@@ -4,4 +4,5 @@ GRAPHICSPROPERTY "visible"
 :test
 TEXT 300 300 {screen.window.fps}
 WAIT 10
-RJP test
+RJP test
+end

Testing/autotests/2+2.outran

@@ -0,0 +1,25 @@
+:main	
+	echo "How deep do you want to go?"
+	nin depth
+	for i=0, i < depth, ++i
+		f = fibb(i)
+		echo i "=>" f
+	end
+end
+
+:twoplustwo
+	return 2 + 2
+end
+
+:threesquared
+	return 3 ** 2
+end
+
+:fibb(x)
+	if x < 2
+		return 1
+	end
+	sub1 = x - 1
+	sub2 = x - 2
+	return fibb(sub1) + fibb(sub2)
+end

Testing/autotests/helloworld.outran

@@ -14,7 +14,7 @@
 	set *l {system.os.name}
 	echo {file.name} " <-file name, os-> " *l	# SystemEnv variables work
 	echo a " and " c
-
+	
 	(echo "1+2 = " (add 1 2))
 	(echo "4+(4+8) = " (add 4 (add 4 8)))	# Lambda Function Calls Work
 	(define dbl (x) (add x x))
@@ -60,7 +60,7 @@
 	wait (nested_mul 10 6 10)	# Wait works along with lambda statements as arguments
 	echo "Done testing WAIT"
 
-	echo (dbl 5) " THIS IS A TEST"
+	echo (dbl 5) " = 10"
 	echo "Please enter three numbers"
 	nin a
 	nin b

Testing/autotests/primes.outran

@@ -0,0 +1,7 @@
+for i=0; i < 20; i = i + 1
+	arr[i] = i
+end
+ALEN arr length	# Get the length of arr and store it in length
+for i=0; i < length; i = i + 1
+	echo arr[i]
+end

Testing/ExampleCode.blz Tests/ExampleCode.blz

@@ -0,0 +1,15 @@
+:main
+	for i=0; i<20; ++i
+		building_string = ""
+		if i % 3 == 0
+			building_string = "bizz"
+		end
+		if i % 5 == 0
+			building_string = building_string + "buzz"
+		end
+		if building_string == ""
+			building_string = i
+		end
+		echo building_string
+	end
+end

Testing/GraphicsTest.blz Tests/GraphicsTest.blz

@@ -0,0 +1,20 @@
+bizzbuzz
+1
+2
+bizz
+4
+buzz
+bizz
+7
+8
+bizz
+buzz
+11
+bizz
+13
+14
+bizzbuzz
+16
+17
+bizz
+19