diff options
author | Jürg Billeter <j@bitron.ch> | 2010-10-28 13:07:01 +0200 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2010-10-28 16:20:17 +0200 |
commit | e81776c024ab1e72b918612e49606f8500aaad06 (patch) | |
tree | e80e6e65ccc417359a8cf8531495d5157a68d232 /ccode | |
parent | 5f3ed0f460a06120900b082c49f9da8bcc1a0a84 (diff) | |
download | vala-e81776c024ab1e72b918612e49606f8500aaad06.tar.gz |
Rename FormalParameter to Parameter
Diffstat (limited to 'ccode')
-rw-r--r-- | ccode/Makefile.am | 2 | ||||
-rw-r--r-- | ccode/valaccodefunction.vala | 10 | ||||
-rw-r--r-- | ccode/valaccodefunctiondeclarator.vala | 6 | ||||
-rw-r--r-- | ccode/valaccodeparameter.vala (renamed from ccode/valaccodeformalparameter.vala) | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/ccode/Makefile.am b/ccode/Makefile.am index 9d54a0954..c63dd06e0 100644 --- a/ccode/Makefile.am +++ b/ccode/Makefile.am @@ -33,7 +33,6 @@ libvalaccode_la_VALASOURCES = \ valaccodeexpression.vala \ valaccodeexpressionstatement.vala \ valaccodefile.vala \ - valaccodeformalparameter.vala \ valaccodeforstatement.vala \ valaccodefragment.vala \ valaccodefunction.vala \ @@ -53,6 +52,7 @@ libvalaccode_la_VALASOURCES = \ valaccodenewline.vala \ valaccodenode.vala \ valaccodeoncesection.vala \ + valaccodeparameter.vala \ valaccodeparenthesizedexpression.vala \ valaccodereturnstatement.vala \ valaccodestatement.vala \ diff --git a/ccode/valaccodefunction.vala b/ccode/valaccodefunction.vala index 9f0abe568..20725eea5 100644 --- a/ccode/valaccodefunction.vala +++ b/ccode/valaccodefunction.vala @@ -50,7 +50,7 @@ public class Vala.CCodeFunction : CCodeNode { */ public CCodeBlock block { get; set; } - private List<CCodeFormalParameter> parameters = new ArrayList<CCodeFormalParameter> (); + private List<CCodeParameter> parameters = new ArrayList<CCodeParameter> (); CCodeBlock current_block; List<CCodeStatement> statement_stack = new ArrayList<CCodeStatement> (); @@ -67,11 +67,11 @@ public class Vala.CCodeFunction : CCodeNode { * * @param param a formal parameter */ - public void add_parameter (CCodeFormalParameter param) { + public void add_parameter (CCodeParameter param) { parameters.add (param); } - public void insert_parameter (int position, CCodeFormalParameter param) { + public void insert_parameter (int position, CCodeParameter param) { parameters.insert (position, param); } @@ -88,7 +88,7 @@ public class Vala.CCodeFunction : CCodeNode { /* no deep copy for lists available yet * func.parameters = parameters.copy (); */ - foreach (CCodeFormalParameter param in parameters) { + foreach (CCodeParameter param in parameters) { func.parameters.add (param); } @@ -111,7 +111,7 @@ public class Vala.CCodeFunction : CCodeNode { writer.write_string (" ("); bool first = true; - foreach (CCodeFormalParameter param in parameters) { + foreach (CCodeParameter param in parameters) { if (!first) { writer.write_string (", "); } else { diff --git a/ccode/valaccodefunctiondeclarator.vala b/ccode/valaccodefunctiondeclarator.vala index 35a35904e..fc59aa830 100644 --- a/ccode/valaccodefunctiondeclarator.vala +++ b/ccode/valaccodefunctiondeclarator.vala @@ -31,7 +31,7 @@ public class Vala.CCodeFunctionDeclarator : CCodeDeclarator { */ public string name { get; set; } - private List<CCodeFormalParameter> parameters = new ArrayList<CCodeFormalParameter> (); + private List<CCodeParameter> parameters = new ArrayList<CCodeParameter> (); public CCodeFunctionDeclarator (string name) { this.name = name; @@ -42,7 +42,7 @@ public class Vala.CCodeFunctionDeclarator : CCodeDeclarator { * * @param param a formal parameter */ - public void add_parameter (CCodeFormalParameter param) { + public void add_parameter (CCodeParameter param) { parameters.add (param); } @@ -56,7 +56,7 @@ public class Vala.CCodeFunctionDeclarator : CCodeDeclarator { writer.write_string (") ("); bool first = true; - foreach (CCodeFormalParameter param in parameters) { + foreach (CCodeParameter param in parameters) { if (!first) { writer.write_string (", "); } else { diff --git a/ccode/valaccodeformalparameter.vala b/ccode/valaccodeparameter.vala index f5ce710ee..9f1c2e186 100644 --- a/ccode/valaccodeformalparameter.vala +++ b/ccode/valaccodeparameter.vala @@ -1,4 +1,4 @@ -/* valaccodeformalparameter.vala +/* valaccodeparameter.vala * * Copyright (C) 2006-2008 Jürg Billeter * @@ -25,7 +25,7 @@ using GLib; /** * Represents a formal parameter in a C method signature. */ -public class Vala.CCodeFormalParameter : CCodeNode { +public class Vala.CCodeParameter : CCodeNode { /** * The parameter name. */ @@ -42,12 +42,12 @@ public class Vala.CCodeFormalParameter : CCodeNode { */ public bool ellipsis { get; set; } - public CCodeFormalParameter (string n, string type) { + public CCodeParameter (string n, string type) { name = n; type_name = type; } - public CCodeFormalParameter.with_ellipsis () { + public CCodeParameter.with_ellipsis () { ellipsis = true; } |