[vala] codegen: Fix delegate target C name for static fields



commit 7b14d21a881902e19f43efdeae1bfbf3b22db859
Author: JÃrg Billeter <j bitron ch>
Date:   Wed Mar 21 17:31:04 2012 +0100

    codegen: Fix delegate target C name for static fields
    
    Fixes bug 671110.

 codegen/valaccodeattribute.vala |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala
index d019ce7..49900dc 100644
--- a/codegen/valaccodeattribute.vala
+++ b/codegen/valaccodeattribute.vala
@@ -461,7 +461,7 @@ public class Vala.CCodeAttribute : AttributeCache {
 					_delegate_target_name = ccode.get_string ("delegate_target_cname");
 				}
 				if (_delegate_target_name == null) {
-					_delegate_target_name = "%s_target".printf (sym.name);
+					_delegate_target_name = "%s_target".printf (name);
 				}
 			}
 			return _delegate_target_name;
@@ -610,6 +610,8 @@ public class Vala.CCodeAttribute : AttributeCache {
 				} else {
 					return "%s%s".printf (CCodeBaseModule.get_ccode_prefix (sym.parent_symbol), sym.name);
 				}
+			} else if (sym is LocalVariable || sym is Parameter) {
+				return sym.name;
 			} else {
 				return "%s%s".printf (CCodeBaseModule.get_ccode_prefix (sym.parent_symbol), sym.name);
 			}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]