strip colons and update ast to use unions

1 files changed, 83 insertions, 83 deletions

diff --git a/src/common/position.odin b/src/common/position.odin
index 4e84568..2ccd0a8 100644
--- a/src/common/position.odin
+++ b/src/common/position.odin
@@ -31,219 +31,219 @@ AbsoluteRange :: struct {
 	end:   int,
 }
 
-AbsolutePosition :: int;
+AbsolutePosition :: int
 
 get_absolute_position :: proc(position: Position, document_text: []u8) -> (AbsolutePosition, bool) {
-	absolute: AbsolutePosition;
+	absolute: AbsolutePosition
 
 	if len(document_text) == 0 {
-		absolute = 0;
-		return absolute, true;
+		absolute = 0
+		return absolute, true
 	}
 
-	line_count := 0;
-	index      := 1;
-	last       := document_text[0];
+	line_count := 0
+	index      := 1
+	last       := document_text[0]
 
 	if !get_index_at_line(&index, &line_count, &last, document_text, position.line) {
-		return absolute, false;
+		return absolute, false
 	}
 
-	absolute = index + get_character_offset_u16_to_u8(position.character, document_text[index:]);
+	absolute = index + get_character_offset_u16_to_u8(position.character, document_text[index:])
 
-	return absolute, true;
+	return absolute, true
 }
 
 get_relative_token_position :: proc(offset: int, document_text: []u8, current_start: int) -> Position {
-	start_index := current_start;
+	start_index := current_start
 
-	data := document_text[start_index:];
+	data := document_text[start_index:]
 
-	i: int;
+	i: int
 
-	position: Position;
+	position: Position
 
 	for i + start_index < offset {
 
-		r, w := utf8.decode_rune(data[i:]);
+		r, w := utf8.decode_rune(data[i:])
 
 		if r == '\n' { //\r?
-			position.character = 0;
-			position.line += 1;
-			i             += 1;
+			position.character = 0
+			position.line += 1
+			i             += 1
 		} else if w == 0 {
-			return position;
+			return position
 		} else {
 			if r < 0x10000 {
-				position.character += 1;
+				position.character += 1
 			} else {
-				position.character += 2;
+				position.character += 2
 			}
 
-			i += w;
+			i += w
 		}
 	}
 
-	return position;
+	return position
 }
 
 /*
 	Get the range of a token in utf16 space
 */
 get_token_range :: proc(node: ast.Node, document_text: string) -> Range {
-	range: Range;
+	range: Range
 
 	go_backwards_to_endline :: proc(offset: int, document_text: []u8) -> int {
 
-		index := offset;
+		index := offset
 
 		for index > 0 && document_text[index] != '\n' && document_text[index] != '\r' {
-			index -= 1;
+			index -= 1
 		}
 
 		if index == 0 {
-			return 0;
+			return 0
 		}
 
-		return index + 1;
-	};
+		return index + 1
+	}
 
-	pos_offset := min(len(document_text) - 1, node.pos.offset);
-	end_offset := min(len(document_text) - 1, node.end.offset);
+	pos_offset := min(len(document_text) - 1, node.pos.offset)
+	end_offset := min(len(document_text) - 1, node.end.offset)
 
-	offset := go_backwards_to_endline(pos_offset, transmute([]u8)document_text);
+	offset := go_backwards_to_endline(pos_offset, transmute([]u8)document_text)
 
-	range.start.line      = node.pos.line - 1;
-	range.start.character = get_character_offset_u8_to_u16(node.pos.column - 1, transmute([]u8)document_text[offset:]);
+	range.start.line      = node.pos.line - 1
+	range.start.character = get_character_offset_u8_to_u16(node.pos.column - 1, transmute([]u8)document_text[offset:])
 
-	offset = go_backwards_to_endline(end_offset, transmute([]u8)document_text);
+	offset = go_backwards_to_endline(end_offset, transmute([]u8)document_text)
 
-	range.end.line      = node.end.line - 1;
-	range.end.character = get_character_offset_u8_to_u16(node.end.column - 1, transmute([]u8)document_text[offset:]);
+	range.end.line      = node.end.line - 1
+	range.end.character = get_character_offset_u8_to_u16(node.end.column - 1, transmute([]u8)document_text[offset:])
 
-	return range;
+	return range
 }
 
 get_absolute_range :: proc(range: Range, document_text: []u8) -> (AbsoluteRange, bool) {
 
-	absolute: AbsoluteRange;
+	absolute: AbsoluteRange
 
 	if len(document_text) == 0 {
-		absolute.start = 0;
-		absolute.end   = 0;
-		return absolute, true;
+		absolute.start = 0
+		absolute.end   = 0
+		return absolute, true
 	}
 
-	line_count := 0;
-	index      := 1;
-	last       := document_text[0];
+	line_count := 0
+	index      := 1
+	last       := document_text[0]
 
 	if !get_index_at_line(&index, &line_count, &last, document_text, range.start.line) {
-		return absolute, false;
+		return absolute, false
 	}
 
-	absolute.start = index + get_character_offset_u16_to_u8(range.start.character, document_text[index:]);
+	absolute.start = index + get_character_offset_u16_to_u8(range.start.character, document_text[index:])
 
 	//if the last line was indexed at zero we have to move it back to index 1.
 	//This happens when line = 0
 	if index == 0 {
-		index = 1;
+		index = 1
 	}
 
 	if !get_index_at_line(&index, &line_count, &last, document_text, range.end.line) {
-		return absolute, false;
+		return absolute, false
 	}
 
-	absolute.end = index + get_character_offset_u16_to_u8(range.end.character, document_text[index:]);
+	absolute.end = index + get_character_offset_u16_to_u8(range.end.character, document_text[index:])
 
-	return absolute, true;
+	return absolute, true
 }
 
 get_index_at_line :: proc(current_index: ^int, current_line: ^int, last: ^u8, document_text: []u8, end_line: int) -> bool {
 
 	if end_line == 0 {
-		current_index^ = 0;
-		return true;
+		current_index^ = 0
+		return true
 	}
 
 	if current_line^ == end_line {
-		return true;
+		return true
 	}
 
 	for ; current_index^ < len(document_text); current_index^ += 1 {
 
-		current := document_text[current_index^];
+		current := document_text[current_index^]
 
 		if last^ == '\r' {
-			current_line^ += 1;
+			current_line^ += 1
 
 			if current_line^ == end_line {
-				last^ = current;
-				current_index^ += 1;
-				return true;
+				last^ = current
+				current_index^ += 1
+				return true
 			}
 		} else if current == '\n' {
-			current_line^ += 1;
+			current_line^ += 1
 
 			if current_line^ == end_line {
-				last^ = current;
-				current_index^ += 1;
-				return true;
+				last^ = current
+				current_index^ += 1
+				return true
 			}
 		}
 
-		last^ = document_text[current_index^];
+		last^ = document_text[current_index^]
 	}
 
-	return false;
+	return false
 }
 
 get_character_offset_u16_to_u8 :: proc(character_offset: int, document_text: []u8) -> int {
 
-	utf8_idx  := 0;
-	utf16_idx := 0;
+	utf8_idx  := 0
+	utf16_idx := 0
 
 	for utf16_idx < character_offset {
 
-		r, w := utf8.decode_rune(document_text[utf8_idx:]);
+		r, w := utf8.decode_rune(document_text[utf8_idx:])
 
 		if r == '\n' || r == '\r' {
-			return utf8_idx;
+			return utf8_idx
 		} else if w == 0 {
-			return utf8_idx;
+			return utf8_idx
 		} else if r < 0x10000 {
-			utf16_idx += 1;
+			utf16_idx += 1
 		} else {
-			utf16_idx += 2;
+			utf16_idx += 2
 		}
 
-		utf8_idx += w;
+		utf8_idx += w
 	}
 
-	return utf8_idx;
+	return utf8_idx
 }
 
 get_character_offset_u8_to_u16 :: proc(character_offset: int, document_text: []u8) -> int {
 
-	utf8_idx  := 0;
-	utf16_idx := 0;
+	utf8_idx  := 0
+	utf16_idx := 0
 
 	for utf8_idx < character_offset {
 
-		r, w := utf8.decode_rune(document_text[utf8_idx:]);
+		r, w := utf8.decode_rune(document_text[utf8_idx:])
 
 		if r == '\n' || r == '\r' {
-			return utf16_idx;
+			return utf16_idx
 		} else if w == 0 {
-			return utf16_idx;
+			return utf16_idx
 		} else if r < 0x10000 {
-			utf16_idx += 1;
+			utf16_idx += 1
 		} else {
-			utf16_idx += 2;
+			utf16_idx += 2
 		}
 
-		utf8_idx += w;
+		utf8_idx += w
 	}
 
-	return utf16_idx;
+	return utf16_idx
 }
\ No newline at end of file