+2007-02-27 Jürg Billeter <j@bitron.ch>
+
+ * vala/valacodenode.vala: mark source_reference as construction property
+ to allow access in Array constructor
+ * vala/valaarraylengthfield.vala: the Array.length field
+ * vala/valaarrayresizemethod.vala: the Array.resize method
+ * vala/valaarray.vala: support arrays of generic type parameters, add
+ length field, add resize method
+ * vala/valatypereference.vala: make source reference optional
+ * vala/valatypeparameter.vala, vala/valasymbolresolver.vala,
+ vala/valasemanticanalyzer.vala: support arrays of generic type
+ parameters
+ * vala/valadatatype.vala, vala/valacodegenerator.vala: support
+ Array.length field and Array.resize method
+ * vala/Makefile.am: update
+
2007-02-27 Jürg Billeter <j@bitron.ch>
* vala/parser.y: accept interfaces with base types
valaarraycreationexpression.c \
valaarraycreationexpression.h \
valaarraycreationexpression.vala \
+ valaarraylengthfield.c \
+ valaarraylengthfield.h \
+ valaarraylengthfield.vala \
+ valaarrayresizemethod.c \
+ valaarrayresizemethod.h \
+ valaarrayresizemethod.vala \
valaassignment.c \
valaassignment.h \
valaassignment.vala \
/* valatype.vala
*
- * Copyright (C) 2006 Raffaele Sandrini
+ * Copyright (C) 2006-2007 Raffaele Sandrini, Jürg Billeter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* Author:
* Raffaele Sandrini <rasa@gmx.ch>
+ * Jürg Billeter <j@bitron.ch>
*/
using GLib;
/**
* DataType of which this is an array of.
*/
- public DataType! element_type { get; set construct; }
+ public DataType element_type { get; set construct; }
+
+ /**
+ * TypeParameter of which this is an array of.
+ */
+ public TypeParameter element_type_parameter { get; set construct; }
/**
* The rank of this array.
private string cname;
- public construct (DataType _element_type, int _rank) {
+ private ArrayLengthField length_field;
+
+ private ArrayResizeMethod resize_method;
+
+ public construct (DataType! _element_type, int _rank, SourceReference! _source_reference) {
rank = _rank;
element_type = _element_type;
+ source_reference = _source_reference;
+
+ if (_rank < 1) {
+ Report.error (null, "internal: attempt to create an array with rank smaller than 1");
+ }
+ }
+
+ public construct with_type_parameter (TypeParameter! _element_type_parameter, int _rank, SourceReference! _source_reference) {
+ rank = _rank;
+ element_type_parameter = _element_type_parameter;
+ source_reference = _source_reference;
if (_rank < 1) {
Report.error (null, "internal: attempt to create an array with rank smaller than 1");
}
Array () {
- /* FIXME: this implementation raises compiler bugs
+ /* FIXME: this implementation reveals compiler bugs
string commas = "";
int i = rank - 1;
name = "%s[%s]".printf (element_type.name, commas); */
int i = rank - 1;
- name = "%s[".printf (element_type.name);
+ if (element_type != null) {
+ name = "%s[".printf (element_type.name);
+ } else {
+ name = "%s[".printf (element_type_parameter.name);
+ }
while (i > 0) {
name = "%s,".printf (name);
i--;
}
name = "%s]".printf (name);
+
+ length_field = new ArrayLengthField (source_reference);
+ length_field.symbol = new Symbol (length_field);
+
+ resize_method = new ArrayResizeMethod (source_reference);
+ resize_method.symbol = new Symbol (resize_method);
}
/**
*/
public override string get_cname (bool const_type = false) {
if (cname == null) {
- if (element_type.is_reference_type ()) {
- cname = "%s*".printf (element_type.get_cname ());
+ if (element_type != null) {
+ if (element_type.is_reference_type ()) {
+ cname = "%s*".printf (element_type.get_cname ());
+ } else {
+ cname = element_type.get_cname ();
+ }
} else {
- cname = element_type.get_cname ();
+ cname = "gpointer";
}
}
* @return list of C header filenames for this data type
*/
public override ref List<string> get_cheader_filenames () {
- return element_type.get_cheader_filenames ();
+ if (element_type != null) {
+ return element_type.get_cheader_filenames ();
+ } else {
+ return null;
+ }
}
public override string get_marshaller_type_name () {
public override string get_set_value_function () {
return "g_value_set_pointer";
}
+
+ public ArrayLengthField get_length_field () {
+ return length_field;
+ }
+
+ public ArrayResizeMethod get_resize_method () {
+ return resize_method;
+ }
}
--- /dev/null
+/* valaarraylengthfield.vala
+ *
+ * Copyright (C) 2007 Jürg Billeter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author:
+ * Jürg Billeter <j@bitron.ch>
+ */
+
+using GLib;
+
+/**
+ * Represents the Array.length field.
+ */
+public class Vala.ArrayLengthField : Field {
+ ArrayLengthField () {
+ access = MemberAccessibility.PUBLIC;
+
+ var root_symbol = source_reference.file.context.get_root ();
+ type_reference.data_type = (DataType) root_symbol.lookup ("int").node;
+ }
+
+ /**
+ * Creates a new array length field.
+ *
+ * @return newly created field
+ */
+ public construct (SourceReference! source) {
+ name = "length";
+ type_reference = new TypeReference ();
+ source_reference = source;
+ }
+}
--- /dev/null
+/* valaarrayresizemethod.vala
+ *
+ * Copyright (C) 2007 Jürg Billeter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author:
+ * Jürg Billeter <j@bitron.ch>
+ */
+
+using GLib;
+
+/**
+ * Represents the Array.resize method.
+ */
+public class Vala.ArrayResizeMethod : Method {
+ ArrayResizeMethod () {
+ access = MemberAccessibility.PUBLIC;
+
+ set_cname ("g_renew");
+
+ var root_symbol = source_reference.file.context.get_root ();
+ var int_type = new TypeReference ();
+ int_type.data_type = (DataType) root_symbol.lookup ("int").node;
+
+ add_parameter (new FormalParameter ("length", int_type));
+
+ returns_modified_pointer = true;
+ }
+
+ /**
+ * Creates a new array resize method.
+ *
+ * @return newly created method
+ */
+ public construct (SourceReference! _source_reference) {
+ name = "resize";
+ return_type = new TypeReference ();
+ source_reference = _source_reference;
+ }
+}
} else {
expr.ccodenode = new CCodeIdentifier (m.base_method.get_cname ());
}
+ } else if (expr.symbol_reference.node is ArrayLengthField) {
+ expr.ccodenode = get_array_length_cexpression (expr.inner, 1);
} else if (expr.symbol_reference.node is Field) {
var f = (Field) expr.symbol_reference.node;
if (f.instance) {
}
}
+ if (m is ArrayResizeMethod) {
+ var array = (Array) m.symbol.parent_symbol.node;
+ ccall.add_argument (new CCodeIdentifier (array.get_cname ()));
+ }
+
/* explicitly use strong reference as ccall gets unrefed
* at end of inner block
*/
/* valacodenode.vala
*
- * Copyright (C) 2006 Jürg Billeter
+ * Copyright (C) 2006-2007 Jürg Billeter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* References the location in the source file where this code node has
* been written.
*/
- public SourceReference source_reference { get; set; }
+ public SourceReference source_reference { get; set construct; }
/**
* Contains all attributes that have been specified for this code node.
/* valatype.vala
*
- * Copyright (C) 2006 Jürg Billeter, Raffaele Sandrini
+ * Copyright (C) 2006-2007 Jürg Billeter, Raffaele Sandrini
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
public weak Namespace @namespace;
private List<string> cheader_filenames;
- /* holds the array types of this type; each rank is a speperate one */
+
+ /* holds the array types of this type; each rank is a separate one */
/* FIXME: uses string because int does not work as key yet */
private HashTable<string,Array> array_types = new HashTable.full (str_hash, str_equal, g_free, g_object_unref);
Array array_type = (Array) array_types.lookup (rank.to_string ());
if (array_type == null) {
- var new_array_type = new Array (this, rank);
+ var new_array_type = new Array (this, rank, source_reference);
/* create a new Symbol */
new_array_type.symbol = new Symbol (new_array_type);
this.symbol.parent_symbol.add (new_array_type.name, new_array_type.symbol);
+
+ /* add internal length field */
+ new_array_type.symbol.add (new_array_type.get_length_field ().name, new_array_type.get_length_field ().symbol);
+ /* add internal resize method */
+ new_array_type.symbol.add (new_array_type.get_resize_method ().name, new_array_type.get_resize_method ().symbol);
+
/* link the array type to the same source as the container type */
new_array_type.source_reference = this.source_reference;
/* link the namespace */
}
expr.static_type = expr.element_type.copy ();
- expr.static_type.data_type = expr.element_type.data_type.get_array (expr.rank);
+ if (expr.element_type.data_type != null) {
+ expr.static_type.data_type = expr.element_type.data_type.get_array (expr.rank);
+ } else {
+ expr.static_type.data_type = expr.element_type.type_parameter.get_array (expr.rank);
+ }
expr.static_type.transfers_ownership = true;
expr.static_type.takes_ownership = true;
/* valasymbolresolver.vala
*
- * Copyright (C) 2006 Jürg Billeter
+ * Copyright (C) 2006-2007 Jürg Billeter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
if (type.array_rank > 0) {
var element_type = new TypeReference ();
element_type.data_type = type.data_type;
- if (type.data_type != null && type.data_type.is_reference_type ()) {
- element_type.takes_ownership = true;
- }
+ element_type.type_parameter = type.type_parameter;
- type.data_type = type.data_type.get_array (type.array_rank);
+ if (type.data_type != null) {
+ if (type.data_type.is_reference_type ()) {
+ element_type.takes_ownership = true;
+ }
+ type.data_type = element_type.data_type.get_array (type.array_rank);
+ } else {
+ type.data_type = element_type.type_parameter.get_array (type.array_rank);
+ type.type_parameter = null;
+ }
type.add_type_argument (element_type);
}
/* valatypeparameter.vala
*
- * Copyright (C) 2006 Jürg Billeter
+ * Copyright (C) 2006-2007 Jürg Billeter
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*/
public weak DataType type;
+ /* holds the array types of this type; each rank is a separate one */
+ /* FIXME: uses string because int does not work as key yet */
+ private HashTable<string,Array> array_types = new HashTable.full (str_hash, str_equal, g_free, g_object_unref);
+
/**
* Creates a new generic type parameter.
*
public override void accept (CodeVisitor! visitor) {
visitor.visit_type_parameter (this);
}
+
+ /**
+ * Returns the array type for elements of this type parameter.
+ *
+ * @param rank the rank the array should be of
+ * @return array type for this type parameter
+ */
+ public Array! get_array (int rank) {
+ Array array_type = (Array) array_types.lookup (rank.to_string ());
+
+ if (array_type == null) {
+ var new_array_type = new Array.with_type_parameter (this, rank, source_reference);
+ /* create a new Symbol */
+ new_array_type.symbol = new Symbol (new_array_type);
+ this.symbol.parent_symbol.add (new_array_type.name, new_array_type.symbol);
+
+ /* add internal length field */
+ new_array_type.symbol.add (new_array_type.get_length_field ().name, new_array_type.get_length_field ().symbol);
+ /* add internal resize method */
+ new_array_type.symbol.add (new_array_type.get_resize_method ().name, new_array_type.get_resize_method ().symbol);
+
+ /* link the array type to the same source as the container type */
+ new_array_type.source_reference = this.source_reference;
+
+ array_types.insert (rank.to_string (), new_array_type);
+
+ array_type = new_array_type;
+ }
+
+ return array_type;
+ }
}
/* valatypereference.vala
*
- * Copyright (C) 2006 Jürg Billeter, Raffaele Sandrini
+ * Copyright (C) 2006-2007 Jürg Billeter, Raffaele Sandrini
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* @param source reference to source code
* @return newly created type reference
*/
- public construct from_name (string ns, string! type, SourceReference source) {
+ public construct from_name (string ns, string! type, SourceReference source = null) {
namespace_name = ns;
type_name = type;
source_reference = source;
projects / thirdparty / vala.git / commitdiff
