From e054dd107f4b3164d39c0206dd5fc2c14b05f186 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Wed, 28 Jun 2006 08:00:19 +0000 Subject: [PATCH] move source_reference to Vala.Literal, use non-null types, don't mark MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2006-06-28 Jürg Billeter * vala/valabooleanliteral.vala, vala/valacharacterliteral.vala, vala/valaintegerliteral.vala, vala/valaliteral.vala, vala/valanullliteral.vala, vala/valarealliteral.vala, vala/valastringliteral.vala: move source_reference to Vala.Literal, use non-null types, don't mark properties as construct-only svn path=/trunk/; revision=54 --- vala/ChangeLog | 8 ++++++++ vala/vala/valabooleanliteral.vala | 1 - vala/vala/valacharacterliteral.vala | 7 +++---- vala/vala/valaintegerliteral.vala | 5 ++--- vala/vala/valaliteral.vala | 1 + vala/vala/valanullliteral.vala | 6 ++---- vala/vala/valarealliteral.vala | 5 ++--- vala/vala/valastringliteral.vala | 9 ++++++--- 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/vala/ChangeLog b/vala/ChangeLog index 78caaed..be74f46 100644 --- a/vala/ChangeLog +++ b/vala/ChangeLog @@ -1,3 +1,11 @@ +2006-06-28 Jürg Billeter + + * vala/valabooleanliteral.vala, vala/valacharacterliteral.vala, + vala/valaintegerliteral.vala, vala/valaliteral.vala, + vala/valanullliteral.vala, vala/valarealliteral.vala, + vala/valastringliteral.vala: move source_reference to Vala.Literal, + use non-null types, don't mark properties as construct-only + 2006-06-26 Jürg Billeter * vala/parser.y: plug some memory leaks, adapt to Vala.Block changes diff --git a/vala/vala/valabooleanliteral.vala b/vala/vala/valabooleanliteral.vala index 7ad98fb..02c57a5 100644 --- a/vala/vala/valabooleanliteral.vala +++ b/vala/vala/valabooleanliteral.vala @@ -25,7 +25,6 @@ using GLib; namespace Vala { public class BooleanLiteral : Literal { public bool value { get; set; } - public SourceReference source_reference { get; set; } public static ref BooleanLiteral! new (bool b, SourceReference source) { return (new BooleanLiteral (value = b, source_reference = source)); diff --git a/vala/vala/valacharacterliteral.vala b/vala/vala/valacharacterliteral.vala index 6a9b6fc..0685e97 100644 --- a/vala/vala/valacharacterliteral.vala +++ b/vala/vala/valacharacterliteral.vala @@ -24,14 +24,13 @@ using GLib; namespace Vala { public class CharacterLiteral : Literal { - public string value { get; construct; } - public SourceReference source_reference { get; construct; } + public string value { get; set; } - public static ref CharacterLiteral new (string c, SourceReference source) { + public static ref CharacterLiteral! new (string c, SourceReference source) { return (new CharacterLiteral (value = c, source_reference = source)); } - public override void accept (CodeVisitor visitor) { + public override void accept (CodeVisitor! visitor) { visitor.visit_character_literal (this); } } diff --git a/vala/vala/valaintegerliteral.vala b/vala/vala/valaintegerliteral.vala index 30738d9..3ee46d8 100644 --- a/vala/vala/valaintegerliteral.vala +++ b/vala/vala/valaintegerliteral.vala @@ -25,13 +25,12 @@ using GLib; namespace Vala { public class IntegerLiteral : Literal { public string value { get; construct; } - public SourceReference source_reference { get; construct; } - public static ref IntegerLiteral new (string i, SourceReference source) { + public static ref IntegerLiteral! new (string i, SourceReference source) { return (new IntegerLiteral (value = i, source_reference = source)); } - public override void accept (CodeVisitor visitor) { + public override void accept (CodeVisitor! visitor) { visitor.visit_integer_literal (this); } } diff --git a/vala/vala/valaliteral.vala b/vala/vala/valaliteral.vala index b820dda..9dc6e82 100644 --- a/vala/vala/valaliteral.vala +++ b/vala/vala/valaliteral.vala @@ -25,5 +25,6 @@ using GLib; namespace Vala { public abstract class Literal : CodeNode { public TypeReference static_type { get; set; } + public SourceReference source_reference { get; set; } } } diff --git a/vala/vala/valanullliteral.vala b/vala/vala/valanullliteral.vala index c9edcb8..b506947 100644 --- a/vala/vala/valanullliteral.vala +++ b/vala/vala/valanullliteral.vala @@ -24,13 +24,11 @@ using GLib; namespace Vala { public class NullLiteral : Literal { - public SourceReference source_reference { get; construct; } - - public static ref NullLiteral new (SourceReference source) { + public static ref NullLiteral! new (SourceReference source) { return (new NullLiteral (source_reference = source)); } - public override void accept (CodeVisitor visitor) { + public override void accept (CodeVisitor! visitor) { visitor.visit_null_literal (this); } } diff --git a/vala/vala/valarealliteral.vala b/vala/vala/valarealliteral.vala index e4f78ea..721c742 100644 --- a/vala/vala/valarealliteral.vala +++ b/vala/vala/valarealliteral.vala @@ -25,13 +25,12 @@ using GLib; namespace Vala { public class RealLiteral : Literal { public string value { get; construct; } - public SourceReference source_reference { get; construct; } - public static ref RealLiteral new (string r, SourceReference source) { + public static ref RealLiteral! new (string r, SourceReference source) { return (new RealLiteral (value = r, source_reference = source)); } - public override void accept (CodeVisitor visitor) { + public override void accept (CodeVisitor! visitor) { visitor.visit_real_literal (this); } } diff --git a/vala/vala/valastringliteral.vala b/vala/vala/valastringliteral.vala index 3f49cfc..627c13a 100644 --- a/vala/vala/valastringliteral.vala +++ b/vala/vala/valastringliteral.vala @@ -25,20 +25,23 @@ using GLib; namespace Vala { public class StringLiteral : Literal { public string value { get; construct; } - public SourceReference source_reference { get; construct; } - public static ref StringLiteral new (string s, SourceReference source) { + public static ref StringLiteral! new (string s, SourceReference source) { return (new StringLiteral (value = s, source_reference = source)); } public ref string eval () { + if (value == null) { + return null; + } + /* remove quotes */ var noquotes = value.offset (1).ndup ((uint) (value.len () - 2)); /* unescape string */ return noquotes.compress (); } - public override void accept (CodeVisitor visitor) { + public override void accept (CodeVisitor! visitor) { visitor.visit_string_literal (this); } } -- 2.7.4