Work on adding struct member functions

Author: sam-astro

examples/pong/main.asa

@@ -6,8 +6,8 @@
 
 
 gameObject :: struct{
-	vector3 position;
-	vector3 rotation;
+	position : vector3;
+	rotation : vector3;
 }
 
 vector2 :: struct{
@@ -24,64 +24,64 @@ vector2 :: struct{
 }
 
 sprite2d :: struct{
-	image2d image = void;
-	vector2 scale = vector2(1, 1);
-	vector2 position = void;
-	float rotation = void;
+	image : image2d = void;
+	scale : vector2 = vector2(1, 1);
+	position : vector2 = void;
+	rotation : float = void;
 
-	create :: (string path){
+	create:: (path : string){
 		image = create_image2d(path);
 	}
-	create :: (string path, vector2 s){
+	create:: (path : string, s : vector2){
 		scale = s;
 		image = create_image2d(path);
 	}
 
-	draw :: (){
+	draw:: (){
 		draw_image(image, position, rotation, scale);
 	}
 }
 
 paddle :: gameObject :: struct{
 	moveSpeed = 1;
-	vector2 minMax = vector2(0, screen_height);
-	sprite2d sprite = sprite2d("./square.png", vector2(0.2, 1));
+	minMax = vector2(0, screen_height);
+	sprite = sprite2d("./square.png", vector2(0.2, 1));
 
-	move :: (float dT){
+	move:: (dT : float){
 		nextPosition = position.y + moveSpeed * dT;
 		if((nextPosition > position.y && nextPosition<minMax.y) || 
 		(nextPosition < position.y && nextPosition>minMax.x))
 			position.y = nextPosition;
 	}
-	draw :: (){
+	draw:: (){
 		sprite.position = vector2(position);
 		sprite.rotation = rotation.z;
 		sprite.draw();
 	}
 }
 
-ball :: gameObject :: struct{
+ball:: gameObject :: struct{
 	moveSpeed = 1;
-	vector2 minMax = vector2(0, screen_height);
-	sprite2d sprite = sprite2d("./ball.png");
+	minMax = vector2(0, screen_height);
+	sprite = sprite2d("./ball.png");
 
-	move :: (float dT){
+	move :: (dT : float){
 		nextPosition = position.y + moveSpeed * dT;
 		if((nextPosition > position.y && nextPosition<minMax.y) || 
 		(nextPosition < position.y && nextPosition>minMax.x))
 			position.y = nextPosition;
 	}
 	draw :: (){
-		sprite.position = (vector2)position;
+		sprite.position = vector2(position);
 		sprite.rotation = rotation.z;
 		sprite.draw();
 	}
 }
 
-list paddles = {paddle(), paddle()};
+paddles : paddle[] = {paddle(), paddle()};
 ball = ball();
 
-main :: (){
+main:: (){
 	w = window_create("Pong", 512, 512);
 
 	paddles[0].position = vector3(10,              screen_height/2, 0);
@@ -91,7 +91,7 @@ main :: (){
 }
 
 // Function called by draw_window method
-update :: (float dT){
+update:: (dT : float ){
 	if(key_down("W"))
 		paddles[0].move(dT);
 	else if(key_down("S"))

examples/start/main.asa

@@ -22,9 +22,24 @@ Or individual components:
 //string :: struct {
 //	c : int;
 //}
-string::string(){
+create::string() #inline; #replaceable; {
 	return *(#new string);
 }
+//cast::string(c : *char) #inline; {
+//	s = string();
+//	
+//	len : uint32 = 0;
+//	for(i : 0..4_294_967_296){
+//		if(c[i] == '\0')
+//			break;
+//		len++;
+//	}
+//	s.address = malloc(len);
+//	for(i : 0..len){
+//		s.address[i] = c[i];
+//	}
+//	s.length = len;
+//}
 
 operator|| :: bool(a : bool, b : bool) #inline {
 	if(a){
@@ -62,7 +77,7 @@ operator[] :: (x : int, y : int){
 	puts("Bracket overload works!\n");
 }
 
-newline::(){
+newline::() #inline; {
 	putchar(10);
 }
 
@@ -76,13 +91,19 @@ main :: (){
 	//y : uint16 = 4;
 	f = float(1);
 
+	var : bool;
+
 	s : string = string();
+	s = string("This works");
 
-	s.c = 8;
-	printint(s.c);
+	s.length = 8;
+	printint(s.length);
+	s.size();
 
 	newline();
 
+	puts(s.address);
+
 	//x_ptr : *int = &x;
 	//begin : *int = x_ptr;
 	//i = 0;

modules/Builtin/asa.asa

@@ -121,28 +121,14 @@ Strings :: module{
 	//#import Builtin.Operators;
 
 	string :: struct {
-		//address : *char;
+		address : *char;
 		length : uint32;
 
-		//size::uint32(){
-		//	return length;
-		//}
+		size::uint32(){
+			return this.length;
+		}
 
-		//cast::string(c : *char){
-		//	len = 0;
-		//	for(i : 0..4_294_967_296){
-		//		if(c[i] == '\0')
-		//		break;
-		//		len++;
-		//	}
-		//	address = malloc(len);
-		//	for(i : 0..len){
-		//		address[i] = c[i];
-		//	}
-		//	length = len;
-		//}
-
-		//binary+ :: string(s : ref string, c : char) #inline {
+		//operator+ :: string(s : ref string, c : char) #inline {
 		//	s.length += 1;
 		//	newAddress : *char = malloc(s.length);
 		//	for(i : 0..s.length-1){
@@ -154,7 +140,7 @@ Strings :: module{
 		//	return s;
 		//}
 
-		//binary+ :: string(s : ref string, otherStr : string) #inline {
+		//operator+ :: string(s : ref string, otherStr : string) #inline {
 		//	oldLength = s.length;
 		//	s.length += otherStr.length;
 		//	newAddress : *char = malloc(s.length);
@@ -169,8 +155,13 @@ Strings :: module{
 		//	return s;
 		//}
 
-		//binary[] :: char(s : ref string, i : int) #inline {
+		//operator[] :: char(s : ref string, i : int) #inline {
 		//	return s.address[i];
 		//}
 	}
+
+	//cast::string(c : *char){
+	//	return string(c);
+	//}
+
 }