Improved function pointer handling.

Fixes #80.

ctranslator.bmx

@@ -324,16 +324,20 @@ Type TCTranslator Extends TTranslator
 						Else
 							' need to test scopes to see if we need to use the current instance's function or not
 							Local fdecl:TFuncDecl = TInvokeExpr(args[i]).decl
+							mungdecl fdecl
 
 							If TClassDecl(fdecl.scope) Then
 								' current scope is related to function scope?
 								If TClassDecl(_env.scope) And TFuncDecl(_env) And TFuncDecl(_env).IsMethod() Then
-									'If TClassDecl(decl.scope).ExtendsClass(TClassDecl(fdecl.scope)) Then
-									Local scope:TScopeDecl = _env.scope
-									Local obj:String = Bra("struct " + scope.munged + "_obj*")
-									Local class:String = "(" + obj + "o)->clas"
+									If TClassDecl(decl.scope).ExtendsClass(TClassDecl(fdecl.scope)) Then
+										Local scope:TScopeDecl = _env.scope
+										Local obj:String = Bra("struct " + scope.munged + "_obj*")
+										Local class:String = "(" + obj + "o)->clas"
 				
-									t:+ class + "->fn_" + fdecl.ident
+										t:+ class + "->fn_" + fdecl.ident
+									Else
+										t:+ fdecl.munged
+									End If
 								Else
 									t:+ fdecl.munged
 								End If

expr.bmx

@@ -97,6 +97,18 @@ Type TExpr
 					TIdentExpr(args[i]).isArg = True
 				End If
 				args[i]=args[i].Semant()
+
+				' if an arg is a invocation without braces, it is *probably* a function pointer.
+				If TInvokeExpr(args[i]) And Not TInvokeExpr(args[i]).invokedWithBraces Then
+					TInvokeExpr(args[i]).exprType = New TFunctionPtrType
+					Local cp:TDecl = TInvokeExpr(args[i]).decl
+					TInvokeExpr(args[i]).decl = TFuncDecl(TInvokeExpr(args[i]).decl.Copy())
+					TInvokeExpr(args[i]).decl.actual = cp
+					TInvokeExpr(args[i]).decl.attrs :| FUNC_PTR
+					TFunctionPtrType(TInvokeExpr(args[i]).exprType).func = TInvokeExpr(args[i]).decl
+
+					TInvokeExpr(args[i]).decl.semant()
+				End If
 			End If
 		Next
 		Return args