Merge: curl: basic Unix domain socket support

[nit.git] / src / astbuilder.nit

diff --git a/src/astbuilder.nit b/src/astbuilder.nit
index 7dafd2f..79d0ba1 100644 (file)
--- a/src/astbuilder.nit
+++ b/src/astbuilder.nit
@@ -16,26 +16,26 @@
 module astbuilder
 
 intrude import semantize::typing
-intrude import semantize::literal
-intrude import semantize::parser
+intrude import literal
+intrude import parser
 intrude import semantize::scope
 
 # General factory to build semantic nodes in the AST of expressions
 class ASTBuilder
        # The module used as reference for the building
-       # It is used to gather types and other stufs
+       # It is used to gather types and other stuff
        var mmodule: MModule
 
        # The anchor used for some mechanism relying on types
        var anchor: nullable MClassType
 
        # Make a new Int literal
-       fun make_int(value: Int): AIntExpr
+       fun make_int(value: Int): AIntegerExpr
        do
-               return new ADecIntExpr.make(value, mmodule.int_type)
+               return new AIntegerExpr.make(value, mmodule.int_type)
        end
 
-       # Make a new instatiation
+       # Make a new instantiation
        fun make_new(callsite: CallSite, args: nullable Array[AExpr]): ANewExpr
        do
                return new ANewExpr.make(callsite, args)
@@ -96,7 +96,7 @@ class ASTBuilder
                return new ABreakExpr.make(escapemark)
        end
 
-       # Make a new condinionnal
+       # Make a new conditional
        # `mtype` is the return type of the whole if, in case of a ternary operator.
        fun make_if(condition: AExpr, mtype: nullable MType): AIfExpr
        do
@@ -128,9 +128,9 @@ redef class AExpr
        private var variable_cache: nullable Variable
 
        # The `detach` method completely remove the node in the parent.
-       # Owever, sometime, it is useful to keep the emplacement of the removed child.
+       # However, sometime, it is useful to keep the emplacement of the removed child.
        #
-       # The standard usecase is the insertion of a node beetwen a parent `p` and a child `p.c`.
+       # The standard use case is the insertion of a node between a parent `p` and a child `p.c`.
        # To create the new node `n`, we need to attach the child to it.
        # But, to put `n` where `c` was in `p`, the place has to be remembered.
        #
@@ -162,7 +162,7 @@ redef class AExpr
 end
 
 # A placeholder for a `AExpr` node
-# Instances are transiantly used to mark some specific emplacments in the AST
+# Instances are transiantly used to mark some specific emplacements in the AST
 # during complex transformations.
 #
 # Their must not appear in a valid AST
@@ -181,7 +181,7 @@ redef class ABlockExpr
                self.is_typed = true
        end
 
-       redef fun add(expr: AExpr)
+       redef fun add(expr)
        do
                n_expr.add expr
        end
@@ -196,7 +196,7 @@ redef class ALoopExpr
                n_block.is_typed = true
        end
 
-       redef fun add(expr: AExpr)
+       redef fun add(expr)
        do
                n_block.add expr
        end
@@ -222,7 +222,7 @@ redef class ADoExpr
                return new ABreakExpr.make(escapemark)
        end
 
-       redef fun add(expr: AExpr)
+       redef fun add(expr)
        do
                n_block.add expr
        end
@@ -256,15 +256,18 @@ end
 redef class AType
        private init make
        do
-               _n_id = new TClassid
+               var n_id = new TClassid
+               var n_qid = new AQclassid
+               n_qid.n_id = n_id
+               _n_qid = n_qid
        end
 end
 
-redef class ADecIntExpr
+redef class AIntegerExpr
        private init make(value: Int, t: MType)
        do
                self.value = value
-               self._n_number = new TNumber # dummy
+               self._n_integer = new TInteger # dummy
                self.mtype = t
        end
 end
@@ -294,7 +297,8 @@ redef class ACallExpr
        do
                self._n_expr = recv
                _n_args = new AListExprs
-               _n_id = new TId
+               _n_qid = new AQid
+               _n_qid.n_id = new TId
                if args != null then
                        self.n_args.n_exprs.add_all(args)
                end