diff options
author | Jürg Billeter <j@bitron.ch> | 2009-10-12 20:15:09 +0200 |
---|---|---|
committer | Jürg Billeter <j@bitron.ch> | 2009-10-12 20:15:09 +0200 |
commit | 5c4bcf9aba99cbb7bd3fd0215750532733b221d1 (patch) | |
tree | 37f5587aa06c264cb0f9da0dd10d094a8cdceb10 /vala/valabasicblock.vala | |
parent | 04a8e745c78d3d2ccd84574d1a5f91481099cb3f (diff) | |
download | vala-5c4bcf9aba99cbb7bd3fd0215750532733b221d1.tar.gz |
Do not use Gee namespace to avoid conflict with libgee
Diffstat (limited to 'vala/valabasicblock.vala')
-rw-r--r-- | vala/valabasicblock.vala | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/vala/valabasicblock.vala b/vala/valabasicblock.vala index 2602f5968..498622c89 100644 --- a/vala/valabasicblock.vala +++ b/vala/valabasicblock.vala @@ -21,22 +21,21 @@ */ using GLib; -using Gee; /** * Represents a basic block, i.e. a straight-line piece of code without any * jumps or jump targets. */ public class Vala.BasicBlock { - private Gee.List<CodeNode> nodes = new ArrayList<CodeNode> (); + private List<CodeNode> nodes = new ArrayList<CodeNode> (); // control flow graph - private Gee.List<weak BasicBlock> predecessors = new ArrayList<weak BasicBlock> (); - private Gee.List<BasicBlock> successors = new ArrayList<BasicBlock> (); + private List<weak BasicBlock> predecessors = new ArrayList<weak BasicBlock> (); + private List<BasicBlock> successors = new ArrayList<BasicBlock> (); // dominator tree public BasicBlock parent { get; private set; } - Gee.List<BasicBlock> children = new ArrayList<BasicBlock> (); + List<BasicBlock> children = new ArrayList<BasicBlock> (); Set<BasicBlock> df = new HashSet<BasicBlock> (); Set<PhiFunction> phi_functions = new HashSet<PhiFunction> (); @@ -54,7 +53,7 @@ public class Vala.BasicBlock { nodes.add (node); } - public Gee.List<CodeNode> get_nodes () { + public List<CodeNode> get_nodes () { return nodes; } @@ -67,11 +66,11 @@ public class Vala.BasicBlock { } } - public Gee.List<weak BasicBlock> get_predecessors () { + public List<weak BasicBlock> get_predecessors () { return new ReadOnlyList<weak BasicBlock> (predecessors); } - public Gee.List<weak BasicBlock> get_successors () { + public List<weak BasicBlock> get_successors () { return new ReadOnlyList<weak BasicBlock> (successors); } @@ -80,7 +79,7 @@ public class Vala.BasicBlock { block.parent = this; } - public Gee.List<BasicBlock> get_children () { + public List<BasicBlock> get_children () { return children; } @@ -88,7 +87,7 @@ public class Vala.BasicBlock { df.add (block); } - public Gee.Set<BasicBlock> get_dominator_frontier () { + public Set<BasicBlock> get_dominator_frontier () { return df; } @@ -96,7 +95,7 @@ public class Vala.BasicBlock { phi_functions.add (phi); } - public Gee.Set<PhiFunction> get_phi_functions () { + public Set<PhiFunction> get_phi_functions () { return phi_functions; } } |