two new compiler error explanations added

compiler_explanations.py

@@ -383,7 +383,7 @@ def get_short_explanation(self, message, colorize_output):
 	),
 
 	Explanation(
-		label = 'dcc-uninitialized-local-variable',
+		label = 'uninitialized-local-variable',
 
 		regex = r"'(.*)' is used uninitialized in this function",
 
@@ -398,7 +398,7 @@ def get_short_explanation(self, message, colorize_output):
 	),
 
 	Explanation(
-		label = 'dcc-function-variable-clash',
+		label = 'function-variable-clash',
 
 		regex = r"called object type '.*' is not a function or function pointer",
 
@@ -418,6 +418,46 @@ def get_short_explanation(self, message, colorize_output):
 """,
 	),
 
+
+	Explanation(
+		label = 'function-definition-not-allowed-here',
+
+		regex = r"function definition is not allowed here",
+
+		precondition = lambda message, match: message.line_number and int(message.line_number) > 1,
+
+		long_explanation = True,
+
+		explanation = """There is likely a closing brace (curly bracket) missing before line {line_number}.
+Is a {emphasize('} missing')} in the previous function?""",
+
+		no_following_explanations = True,
+
+		reproduce = """
+int f(int a) {
+	return a;
+	
+int main(void) { 
+	return f(0);
+}
+""",
+	),
+
+	Explanation(
+		label = 'indirection-requires-pointer-operand',
+
+		regex = r"indirection requires pointer operand \('(.*)' invalid\)",
+
+		explanation = """ you are trying to use '{emphasize(underlined_word)}' as a pointer.
+  You can not do this because '{emphasize(underlined_word)}' is of type {emphasize(match.group(1))}.
+""",
+
+		reproduce = """
+int main(int argc, char *argv[]) {
+	return *argc;
+}
+""",
+	),
 ]
 
 def extract_system_include_file(string):

docs/function-definition-not-allowed-here.md

@@ -0,0 +1,33 @@
+
+If you forget a curly bracket, e.g.
+```c
+int sum(int x, int y) {
+	if (x > y) {
+		return x + y;
+	} else {
+		return x - y;
+		// <-- missing closing curly bracket
+}
+
+int f(int x) {
+	return sum(x, x);
+}
+```
+
+The compiler will give an error when the next function definition starts.
+
+You can fix by adding the missing curly bracket (brace):
+
+```c
+int sum(int x, int y) {
+	if (x > y) {
+		return x + y;
+	} else {
+		return x - y;
+	}
+}
+		
+int f(int x) {
+	return sum(x, x);
+}
+```

drive_gdb.py

@@ -16,7 +16,7 @@
 def drive_gdb():
 	global debug
 	debug = int(os.environ.get('DCC_DEBUG', '0'))
-	output_stream = os.fdopen(3, "w")
+	output_stream = os.fdopen(3, "w", encoding='utf-8', errors='replace')
 	colorize_output = output_stream.isatty() or os.environ.get('DCC_COLORIZE_OUTPUT', False)
 	if colorize_output:
 		color = colors.color
@@ -307,7 +307,7 @@ def fileline(filename, line_number, clean=False):
 			return clean_c_source(source[filename][line_number - 1])
 		return source[filename][line_number - 1]
 	try:
-		with open(filename) as f:
+		with open(filename, encoding='utf-8', errors='replace') as f:
 			source[filename] = f.readlines()
 			for line in source[filename]:
 				m = re.match(r'^\s*#\s*define\s*(\w+)\s*(.*\S)', line)

tests/expected_output/clang-6.0-x86_64-pc-linux-gnu/function-definition-not-allowed-here.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/function-definition-not-allowed-here.c:5:16: error: function definition is not allowed here
+int main(void) { 
+               ^
+dcc explanation: There is likely a closing brace (curly bracket) missing before line 5.
+Is a } missing in the previous function?
+  See more information here: https://comp1511unsw.github.io/dcc/function-definition-not-allowed-here.html

tests/expected_output/clang-6.0-x86_64-pc-linux-gnu/function-variable-clash.txt

@@ -0,0 +1,7 @@
+tests/extracted_compile_time_tests/function-variable-clash.c:4:13: error: called object type 'int' is not a function or function pointer
+        return main();
+               ~~~~^
+dcc explanation: 'main' is the name of a variable but you are trying to call it as a function.
+  If 'main' is also the name of a function, you can avoid the clash,
+  by changing the name of the variable 'main' to something else.
+  See more information here: https://comp1511unsw.github.io/dcc/function-variable-clash.html

tests/expected_output/clang-6.0-x86_64-pc-linux-gnu/indirection-requires-pointer-operand.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/indirection-requires-pointer-operand.c:3:9: error: indirection requires pointer operand ('int' invalid)
+        return *argc;
+               ^~~~~
+dcc explanation:  you are trying to use 'argc' as a pointer.
+  You can not do this because 'argc' is of type int.
+

tests/expected_output/clang-6.0-x86_64-pc-linux-gnu/uninitialized-local-variable.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/uninitialized-local-variable.c: In function ‘main’:
+tests/extracted_compile_time_tests/uninitialized-local-variable.c:4:10: warning: ‘a[0]’ is used uninitialized in this function [-Wuninitialized]
+  return a[0];
+         ~^~~
+dcc explanation: You are using the value of the variable a[0] before assigning a value to a[0].
+

tests/expected_output/clang-7.0-x86_64-pc-linux-gnu/function-definition-not-allowed-here.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/function-definition-not-allowed-here.c:5:16: error: function definition is not allowed here
+int main(void) { 
+               ^
+dcc explanation: There is likely a closing brace (curly bracket) missing before line 5.
+Is a } missing in the previous function?
+  See more information here: https://comp1511unsw.github.io/dcc/function-definition-not-allowed-here.html

tests/expected_output/clang-7.0-x86_64-pc-linux-gnu/function-variable-clash.txt

@@ -0,0 +1,7 @@
+tests/extracted_compile_time_tests/function-variable-clash.c:4:13: error: called object type 'int' is not a function or function pointer
+        return main();
+               ~~~~^
+dcc explanation: 'main' is the name of a variable but you are trying to call it as a function.
+  If 'main' is also the name of a function, you can avoid the clash,
+  by changing the name of the variable 'main' to something else.
+  See more information here: https://comp1511unsw.github.io/dcc/function-variable-clash.html

tests/expected_output/clang-7.0-x86_64-pc-linux-gnu/indirection-requires-pointer-operand.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/indirection-requires-pointer-operand.c:3:9: error: indirection requires pointer operand ('int' invalid)
+        return *argc;
+               ^~~~~
+dcc explanation:  you are trying to use 'argc' as a pointer.
+  You can not do this because 'argc' is of type int.
+

tests/expected_output/clang-7.0-x86_64-pc-linux-gnu/uninitialized-local-variable.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/uninitialized-local-variable.c: In function ‘main’:
+tests/extracted_compile_time_tests/uninitialized-local-variable.c:4:10: warning: ‘a[0]’ is used uninitialized in this function [-Wuninitialized]
+  return a[0];
+         ~^~~
+dcc explanation: You are using the value of the variable a[0] before assigning a value to a[0].
+

tests/expected_output/clang-8.0-x86_64-pc-linux-gnu/function-definition-not-allowed-here.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/function-definition-not-allowed-here.c:5:16: error: function definition is not allowed here
+int main(void) { 
+               ^
+dcc explanation: There is likely a closing brace (curly bracket) missing before line 5.
+Is a } missing in the previous function?
+  See more information here: https://comp1511unsw.github.io/dcc/function-definition-not-allowed-here.html

tests/expected_output/clang-8.0-x86_64-pc-linux-gnu/function-variable-clash.txt

@@ -0,0 +1,7 @@
+tests/extracted_compile_time_tests/function-variable-clash.c:4:13: error: called object type 'int' is not a function or function pointer
+        return main();
+               ~~~~^
+dcc explanation: 'main' is the name of a variable but you are trying to call it as a function.
+  If 'main' is also the name of a function, you can avoid the clash,
+  by changing the name of the variable 'main' to something else.
+  See more information here: https://comp1511unsw.github.io/dcc/function-variable-clash.html

tests/expected_output/clang-8.0-x86_64-pc-linux-gnu/indirection-requires-pointer-operand.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/indirection-requires-pointer-operand.c:3:9: error: indirection requires pointer operand ('int' invalid)
+        return *argc;
+               ^~~~~
+dcc explanation:  you are trying to use 'argc' as a pointer.
+  You can not do this because 'argc' is of type int.
+

tests/expected_output/clang-8.0-x86_64-pc-linux-gnu/uninitialized-local-variable.txt

@@ -0,0 +1,6 @@
+tests/extracted_compile_time_tests/uninitialized-local-variable.c: In function ‘main’:
+tests/extracted_compile_time_tests/uninitialized-local-variable.c:4:10: warning: ‘a[0]’ is used uninitialized in this function [-Wuninitialized]
+  return a[0];
+         ~^~~
+dcc explanation: You are using the value of the variable a[0] before assigning a value to a[0].
+