From 51c42aef2aa0848e369f7cd20554e77d9c84ff0b Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Sun, 24 Feb 2008 15:49:11 +0000 Subject: [PATCH] support main function in root namespace, fixes bug 516950 2008-02-24 Juerg Billeter * vala/valamethod.vala: support main function in root namespace, fixes bug 516950 svn path=/trunk/; revision=1051 --- ChangeLog | 5 +++++ vala/valamethod.vala | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eb8b6f605..464971994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-24 Jürg Billeter + + * vala/valamethod.vala: support main function in root namespace, + fixes bug 516950 + 2008-02-24 Jürg Billeter * vala/valasemanticanalyzer.vala, gobject/valaccodegenerator.vala: diff --git a/vala/valamethod.vala b/vala/valamethod.vala index 299e78ebe..ef43e1ad0 100644 --- a/vala/valamethod.vala +++ b/vala/valamethod.vala @@ -296,7 +296,10 @@ public class Vala.Method : Member { * @return the name to be used in C code by default */ public virtual string! get_default_cname () { - if (name.has_prefix ("_")) { + if (name == "main" && parent_symbol.name == null) { + // avoid conflict with generated main function + return "_main"; + } else if (name.has_prefix ("_")) { return "_%s%s".printf (parent_symbol.get_lower_case_cprefix (), name.offset (1)); } else { return "%s%s".printf (parent_symbol.get_lower_case_cprefix (), name); -- 2.47.3