From 898245431f147c9f31207f855c47d7fb54f5c53c Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Mon, 26 Apr 2021 21:07:58 +0100
Subject: [PATCH] Make -strict-style the default #871

---
 src/build_settings.cpp |  1 -
 src/main.cpp           |  8 ++------
 src/parser.cpp         | 15 +++++----------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 72b72a738..5fbf75126 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -201,7 +201,6 @@ struct BuildContext {
 	bool   keep_object_files;
 	bool   disallow_do;
 	bool   insert_semicolon;
-	bool   strict_style;
 
 	bool   ignore_warnings;
 	bool   warnings_as_errors;
diff --git a/src/main.cpp b/src/main.cpp
index c34377bfa..fbce4838c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1216,8 +1216,8 @@ bool parse_build_flags(Array<String> args) {
 							break;
 
 						case BuildFlag_StrictStyle:
-							build_context.insert_semicolon = true;
-							build_context.strict_style = true;
+							gb_printf_err("-strict-style flag is not required any more\n");
+							bad_flags = true;
 							break;
 
 
@@ -1802,10 +1802,6 @@ void print_show_help(String const arg0, String const &command) {
 		print_usage_line(2, "Inserts semicolons on newlines during tokenization using a basic rule");
 		print_usage_line(0, "");
 
-		print_usage_line(1, "-strict-style");
-		print_usage_line(2, "Enforces code style stricter whilst parsing, requiring such things as trailing commas");
-		print_usage_line(0, "");
-
 		print_usage_line(1, "-ignore-warnings");
 		print_usage_line(2, "Ignores warning messages");
 		print_usage_line(0, "");
diff --git a/src/parser.cpp b/src/parser.cpp
index c3bfc4dab..7ee710d6a 100644
--- a/src/parser.cpp
+++ b/src/parser.cpp
@@ -1232,13 +1232,10 @@ void comsume_comment_groups(AstFile *f, Token prev) {
 }
 
 bool ignore_newlines(AstFile *f) {
-	if (build_context.strict_style) {
-	    	if (f->allow_newline) {
-	    		return f->expr_level > 0;
-	    	}
-	    	return f->expr_level >= 0;
+	if (f->allow_newline) {
+		return f->expr_level > 0;
 	}
-	return false;
+	return f->expr_level >= 0;
 }
 
 
@@ -1556,7 +1553,7 @@ bool is_semicolon_optional_for_node(AstFile *f, Ast *s) {
 }
 
 void expect_semicolon_newline_error(AstFile *f, Token const &token, Ast *s) {
-	if (build_context.strict_style && token.string == "\n") {
+	if (token.string == "\n") {
 		switch (token.kind) {
 		case Token_CloseBrace:
 		case Token_CloseParen:
@@ -4556,9 +4553,7 @@ ParseFileError init_ast_file(AstFile *f, String fullpath, TokenPos *err_pos) {
 		return ParseFile_WrongExtension;
 	}
 	TokenizerFlags tokenizer_flags = TokenizerFlag_None;
-	if (build_context.insert_semicolon) {
-		tokenizer_flags = TokenizerFlag_InsertSemicolon;
-	}
+	tokenizer_flags = TokenizerFlag_InsertSemicolon;
 
 	zero_item(&f->tokenizer);
 	f->tokenizer.curr_file_id = f->id;