浏览代码

Fixed flag value clash.

woollybah 8 年之前
父节点
当前提交
87aff421c9
共有 2 个文件被更改,包括 20 次插入15 次删除
  1. 15 15
      decl.bmx
  2. 5 0
      iparser.bmx

+ 15 - 15
decl.bmx

@@ -22,29 +22,29 @@
 '    distribution.
 '
 
-Const DECL_EXTERN:Int=      $010000
-Const DECL_PRIVATE:Int=     $020000
-Const DECL_ABSTRACT:Int=    $040000
-Const DECL_FINAL:Int=       $080000
+Const DECL_EXTERN:Int=        $010000
+Const DECL_PRIVATE:Int=       $020000
+Const DECL_ABSTRACT:Int=      $040000
+Const DECL_FINAL:Int=         $080000
 
-Const DECL_SEMANTED:Int=    $100000
-Const DECL_SEMANTING:Int=   $200000
+Const DECL_SEMANTED:Int=      $100000
+Const DECL_SEMANTING:Int=     $200000
 
-Const DECL_POINTER:Int=     $400000
+Const DECL_POINTER:Int=       $400000
 
-Const DECL_ARG:Int=         $800000
-Const DECL_INITONLY:Int=   $1000000
+Const DECL_ARG:Int=           $800000
+Const DECL_INITONLY:Int=     $1000000
 
-Const DECL_NODEBUG:Int=    $2000000
-Const DECL_PROTECTED:Int=  $4000000
+Const DECL_NODEBUG:Int=      $2000000
+Const DECL_PROTECTED:Int=    $4000000
 
 Const DECL_API_CDECL:Int=   $00000000
 Const DECL_API_STDCALL:Int= $10000000
-Const DECL_API_DEFAULT:Int= DECL_API_CDECL
+Const DECL_API_DEFAULT:Int=DECL_API_CDECL
 
-Const CLASS_INTERFACE:Int=  $001000
-Const CLASS_THROWABLE:Int=  $002000
-Const CLASS_STRUCT:Int=     $004000
+Const CLASS_INTERFACE:Int=    $002000
+Const CLASS_THROWABLE:Int=    $004000
+Const CLASS_STRUCT:Int=       $008000
 
 Const SCOPE_FUNC:Int = 0
 Const SCOPE_CLASS_LOCAL:Int = 1

+ 5 - 0
iparser.bmx

@@ -1161,6 +1161,11 @@ End Rem
 			decl=New TGlobalDecl.Create( id,ty,init,attrs )
 		Else If attrs & DECL_FIELD
 			decl=New TFieldDecl.Create( id,ty,init,attrs )
+			
+			If TFunctionPtrType(ty) Then
+				TFunctionPtrType(ty).func.attrs :| FUNC_FIELD
+			End If
+			
 		Else If attrs & DECL_CONST
 			decl=New TConstDecl.Create( id,ty,init,attrs )
 		Else If attrs & DECL_LOCAL