Mercurial > projects > dil
changeset 695:170ddcdc9711
Renamed VoidInitializer, ArrayInitializer and StructInitializer.
author | Aziz K?ksal <aziz.koeksal@gmail.com> |
---|---|
date | Tue, 22 Jan 2008 23:23:03 +0100 |
parents | 19a34b69cc7d |
children | c67d2c3c0b3d |
files | trunk/src/cmd/Generate.d trunk/src/dil/SettingsLoader.d trunk/src/dil/ast/DefaultVisitor.d trunk/src/dil/ast/Expressions.d trunk/src/dil/ast/NodesEnum.d trunk/src/dil/parser/Parser.d |
diffstat | 6 files changed, 15 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/trunk/src/cmd/Generate.d Tue Jan 22 20:56:10 2008 +0100 +++ b/trunk/src/cmd/Generate.d Tue Jan 22 23:23:03 2008 +0100 @@ -103,15 +103,7 @@ suffixLength = "Statement".length; break; case NC.Expression: - switch (node.kind) - { - case NodeKind.VoidInitializer, - NodeKind.ArrayInitializer, - NodeKind.StructInitializer: - break; - default: - suffixLength = "Expression".length; - } + suffixLength = "Expression".length; break; case NC.Type: suffixLength = "Type".length;
--- a/trunk/src/dil/SettingsLoader.d Tue Jan 22 20:56:10 2008 +0100 +++ b/trunk/src/dil/SettingsLoader.d Tue Jan 22 23:23:03 2008 +0100 @@ -42,7 +42,7 @@ GlobalSettings.langFile = val.getString(); break; case "import_paths": - if (auto array = e.Is!(ArrayInitializer)) + if (auto array = e.Is!(ArrayInitExpression)) { foreach (value; array.values) if (auto str = value.Is!(StringExpression)) @@ -90,7 +90,7 @@ switch (variableName) { case "messages": - if (auto array = e.Is!(ArrayInitializer)) + if (auto array = e.Is!(ArrayInitExpression)) { foreach (value; array.values) {
--- a/trunk/src/dil/ast/DefaultVisitor.d Tue Jan 22 20:56:10 2008 +0100 +++ b/trunk/src/dil/ast/DefaultVisitor.d Tue Jan 22 23:23:03 2008 +0100 @@ -182,10 +182,10 @@ static if (is(E == TraitsExpression)) visitN(e.targs); // VoidInitializer has no subnodes. - static if (is(E == ArrayInitializer)) + static if (is(E == ArrayInitExpression)) foreach (i, key; e.keys) key && visitE(key), visitE(e.values[i]); - static if (is(E == StructInitializer)) + static if (is(E == StructInitExpression)) foreach (value; e.values) visitE(value); }
--- a/trunk/src/dil/ast/Expressions.d Tue Jan 22 20:56:10 2008 +0100 +++ b/trunk/src/dil/ast/Expressions.d Tue Jan 22 23:23:03 2008 +0100 @@ -960,7 +960,7 @@ } // } -class VoidInitializer : Expression +class VoidInitExpression : Expression { this() { @@ -968,7 +968,7 @@ } } -class ArrayInitializer : Expression +class ArrayInitExpression : Expression { Expression[] keys; Expression[] values; @@ -986,7 +986,7 @@ } } -class StructInitializer : Expression +class StructInitExpression : Expression { Identifier*[] idents; Expression[] values;
--- a/trunk/src/dil/ast/NodesEnum.d Tue Jan 22 20:56:10 2008 +0100 +++ b/trunk/src/dil/ast/NodesEnum.d Tue Jan 22 23:23:03 2008 +0100 @@ -171,9 +171,9 @@ "ParenExpression", "FunctionLiteralExpression", "TraitsExpression", // D2.0 - "VoidInitializer", - "ArrayInitializer", - "StructInitializer", + "VoidInitExpression", + "ArrayInitExpression", + "StructInitExpression", "AsmTypeExpression", "AsmOffsetExpression", "AsmSegExpression",
--- a/trunk/src/dil/parser/Parser.d Tue Jan 22 20:56:10 2008 +0100 +++ b/trunk/src/dil/parser/Parser.d Tue Jan 22 23:23:03 2008 +0100 @@ -528,9 +528,8 @@ Identifier*[] idents = [ident]; Expression[] values; goto LenterLoop; // We've already parsed an identifier. Jump to if statement and check for initializer. - while (token.kind == T.Comma) + while (skipped(T.Comma)) { - nT(); idents ~= requireIdentifier(MSG.ExpectedVariableName); LenterLoop: if (skipped(T.Assign)) @@ -555,7 +554,7 @@ if (next == T.Comma || next == T.Semicolon) { nT(); - return set(new VoidInitializer(), begin); + return set(new VoidInitExpression(), begin); } } return parseNonVoidInitializer(); @@ -594,7 +593,7 @@ nT(); } require(T.RBracket); - init = new ArrayInitializer(keys, values); + init = new ArrayInitExpression(keys, values); break; case T.LBrace: // StructInitializer: @@ -626,7 +625,7 @@ nT(); } require(T.RBrace); - return new StructInitializer(idents, values); + return new StructInitExpression(idents, values); } bool success;