/// Current block is used to add statements as we find
/// them.
/// </summary>
- Block current_block, top_current_block;
+ Block current_block;
Delegate current_delegate;
syntax_error (lexer.Location, "a property can't have type arguments");
prop = new Property (current_class, (Expression) $3, (int) $2, false,
- name, (Attributes) $1, get_block, set_block, accessors.declared_in_reverse);
-
+ name, (Attributes) $1, get_block, set_block, accessors.declared_in_reverse, current_block);
+
current_container.AddProperty (prop);
implicit_value_parameter_type = null;
}
open_parens opt_formal_parameter_list CLOSE_PARENS
{
- current_local_parameters = (Parameters) $4;
- current_block = top_current_block = new ToplevelBlock (null,
- current_local_parameters, null, Location.Null);
-
LocatedToken lt = (LocatedToken) $1;
+ current_local_parameters = (Parameters) $4;
+ current_block = new ToplevelBlock (null, current_local_parameters, null, lt.Location);
+
$$ = new Constructor (current_class, lt.Value, 0, current_local_parameters,
null, lt.Location);
constructor_body
: block_prepared
- | SEMICOLON { current_block = top_current_block = null; $$ = null; }
+ | SEMICOLON { current_block = null; $$ = null; }
;
constructor_initializer
}
;
+opt_object_or_collection_initializer
+ : /* empty */ { $$ = null; }
+ | object_or_collection_initializer
+ ;
+
+object_or_collection_initializer
+ : object_initializer
+ | collection_initializer
+ ;
+
+object_initializer
+ : OPEN_BRACE opt_member_initializer_list CLOSE_BRACE
+ {
+ if ($2 == null)
+ $$ = null;
+ else
+ $$ = new ObjectInitializer ((ArrayList)$2);
+ }
+ | OPEN_BRACE member_initializer_list COMMA CLOSE_BRACE
+ {
+ $$ = new ObjectInitializer ((ArrayList) $2);
+ }
+ ;
+
+opt_member_initializer_list
+ : /* empty */ { $$ = null; }
+ | member_initializer_list
+ ;
+
+member_initializer_list
+ : member_initializer
+ {
+ ArrayList a = new ArrayList ();
+ a.Add ($1);
+ $$ = a;
+ }
+ | member_initializer_list COMMA member_initializer
+ {
+ ArrayList a = (ArrayList)$1;
+ a.Add ($3);
+ $$ = a;
+ }
+ ;
+
+member_initializer
+ : IDENTIFIER ASSIGN initializer_value
+ {
+ LocatedToken id = $1 as LocatedToken;
+ IInitializable i = $3 as IInitializable;
+ if (i != null)
+ $$ = new Initializer (id.Value, i);
+ else
+ $$ = new Initializer (id.Value, (Expression)$3);
+ }
+ ;
+
+initializer_value
+ : expression
+ | object_or_collection_initializer
+ ;
+
+collection_initializer
+ : OPEN_BRACE element_initializer_list CLOSE_BRACE
+ {
+ $$ = new CollectionInitializer ((ArrayList) $2);
+ }
+ | OPEN_BRACE element_initializer_list COMMA CLOSE_BRACE
+ {
+ $$ = new CollectionInitializer ((ArrayList) $2);
+ }
+ ;
+
+element_initializer_list
+ : element_initializer
+ {
+ ArrayList a = new ArrayList ();
+ a.Add ($1);
+ $$ = a;
+ }
+ | element_initializer_list COMMA element_initializer
+ {
+ ArrayList a = $1 as ArrayList;
+ a.Add ($3);
+ $$ = a;
+ }
+ ;
+
+element_initializer
+ : non_assignment_expression
+ ;
+
opt_argument_list
: /* empty */ { $$ = null; }
| argument_list
new_expression
: object_or_delegate_creation_expression
| array_creation_expression
- | collection_initialization_expression
| anonymous_type_expression
;
object_or_delegate_creation_expression
- : NEW type OPEN_PARENS opt_argument_list CLOSE_PARENS opt_object_initializer
+ : NEW type OPEN_PARENS opt_argument_list CLOSE_PARENS opt_object_or_collection_initializer
{
if ($6 != null) {
if (RootContext.Version < LanguageVersion.LINQ) {
$$ = null;
}
else
- $$ = new NewInitialize ((Expression) $2, (ArrayList) $4, (Location) $1, (ArrayList) $6);
+ $$ = new NewInitialize ((Expression) $2, (ArrayList) $4, (IInitializable) $6, (Location) $1);
}
else
$$ = new New ((Expression) $2, (ArrayList) $4, (Location) $1);
}
- ;
-
-collection_initialization_expression
- : NEW type OPEN_BRACE argument_list CLOSE_BRACE
+ | NEW type object_or_collection_initializer
{
if (RootContext.Version < LanguageVersion.LINQ) {
Report.Error (1526, (Location) $1, "A new expression requires () or [] after type");
- $$ = null;
- }
- else
- $$ = new CollectionInitialize ((Expression) $2, new ArrayList (), (Location) $1, (ArrayList) $4);
+ $$ = null;
+ }
+ else
+ $$ = new NewInitialize ((Expression) $2, new ArrayList (), (IInitializable) $3, (Location) $1);
}
;
}
statement_list
{
- Block topmost = current_block;
-
- while (topmost.Implicit)
- topmost = topmost.Parent;
- $$ = new SwitchSection ((ArrayList) $1, topmost);
+ $$ = new SwitchSection ((ArrayList) $1, current_block.Explicit);
}
;
: FOR open_parens
opt_for_initializer SEMICOLON
{
- Block assign_block = new Block (current_block);
- current_block = assign_block;
+ Location l = lexer.Location;
+ start_block (l);
+ Block assign_block = current_block;
if ($3 is DictionaryEntry){
DictionaryEntry de = (DictionaryEntry) $3;
if (vi == null)
continue;
- Location l = lexer.Location;
Expression expr = decl.expression_or_array_initializer;
LocalVariableReference var;
For f = new For ((Statement) $5, (Expression) $6, (Statement) $8, (Statement) $10, l);
current_block.AddStatement (f);
- while (current_block.Implicit)
- current_block = current_block.Parent;
- $$ = current_block;
- current_block = current_block.Parent;
+
+ $$ = end_block (lexer.Location);
}
;
{
// CHANGE: was `null'
Statement s = (Statement) $1;
- Block b = new Block (current_block, Block.Flags.Implicit, s.loc, lexer.Location);
+ Block b = new Block (current_block, s.loc, lexer.Location);
b.AddStatement (s);
$$ = b;
| FOREACH open_parens type IDENTIFIER IN
expression CLOSE_PARENS
{
- Block foreach_block = new Block (current_block);
- current_block = foreach_block;
+ start_block (lexer.Location);
+ Block foreach_block = current_block;
LocatedToken lt = (LocatedToken) $4;
Location l = lt.Location;
current_block.AddStatement (f);
}
- while (current_block.Implicit)
- current_block = current_block.Parent;
- $$ = current_block;
- current_block = current_block.Parent;
+ $$ = end_block (lexer.Location);
}
;
one.Add (new VariableDeclaration (lt, null));
- current_block = new Block (current_block);
- Block b = declare_local_variables (type, one, lt.Location);
- current_block = b;
+ start_block (lexer.Location);
+ current_block = declare_local_variables (type, one, lt.Location);
}
}
} block {
if (lt != null){
id = lt.Value;
- while (current_block.Implicit)
- current_block = current_block.Parent;
- var_block = current_block;
- current_block = current_block.Parent;
+ var_block = end_block (lexer.Location);
}
}
Location l = (Location) $1;
int top = list.Count;
- Block assign_block = new Block (current_block);
- current_block = assign_block;
+ start_block (lexer.Location);
+ Block assign_block = current_block;
for (int i = 0; i < top; i++){
Pair p = (Pair) list [i];
Fixed f = new Fixed ((Expression) $3, (ArrayList) $4, (Statement) $7, l);
current_block.AddStatement (f);
- while (current_block.Implicit)
- current_block = current_block.Parent;
- $$ = current_block;
- current_block = current_block.Parent;
+
+ $$ = end_block (lexer.Location);
}
;
using_statement
: USING open_parens resource_acquisition CLOSE_PARENS
{
- Block assign_block = new Block (current_block);
- current_block = assign_block;
+ start_block (lexer.Location);
+ Block assign_block = current_block;
if ($3 is DictionaryEntry){
DictionaryEntry de = (DictionaryEntry) $3;
{
Using u = new Using ($5, (Statement) $6, (Location) $1);
current_block.AddStatement (u);
- while (current_block.Implicit)
- current_block = current_block.Parent;
- $$ = current_block;
- current_block = current_block.Parent;
+ $$ = end_block (lexer.Location);
}
;
: from_clause query_body
{
lexer.QueryParsing = false;
- $$ = new QueryExpression ((Expression)$1, (Expression)$2);
- current_block = current_block.Parent;
+ $$ = new Linq.QueryExpression (current_container, current_block, (Expression)$1, (Linq.AQueryClause)$2);
+ end_block (lexer.Location);
}
;
from_clause
: FROM IDENTIFIER IN expression opt_join_clauses
{
- current_block = new Block (current_block);
+ start_block (lexer.Location);
LocatedToken lt = (LocatedToken) $2;
LocalInfo vi = current_block.AddVariable (TypeManager.system_object_expr, lt.Value, lt.Location); // TODO: null is var type
}
| FROM type IDENTIFIER IN expression opt_join_clauses
{
- current_block = new Block (current_block);
+ start_block (lexer.Location);
LocatedToken lt = (LocatedToken) $3;
- LocalInfo vi = current_block.AddVariable ((Expression)$2, lt.Value, lt.Location);
- $$ = $5;
+ Expression type = (Expression)$2;
+ LocalInfo vi = current_block.AddVariable (type, lt.Value, lt.Location);
+ $$ = new Linq.Cast (type, (Expression)$5, lt.Location);
}
;
query_body
: opt_from_let_where_clauses opt_orderby_clause SELECT expression opt_query_continuation
{
- $$ = new Select (current_container, current_block, (Expression)$4, GetLocation ($3));
+ Linq.AQueryClause ret = new Linq.Select ((Expression)$4, GetLocation ($3));
+
+ if ($1 != null) {
+ ((Linq.AQueryClause)$1).Next = ret;
+ ret = (Linq.AQueryClause)$1;
+ }
+
+ $$ = ret;
}
| opt_from_let_where_clauses opt_orderby_clause group_clause opt_query_continuation
;
where_clause
: WHERE boolean_expression
+ {
+ $$ = new Linq.Where ((Expression)$2, GetLocation ($1));
+ }
;
opt_orderby_clause
// int j = 1; int k = j + 1;
//
if (current_block.Used)
- implicit_block = new Block (current_block, Block.Flags.Implicit, loc, Location.Null);
+ implicit_block = new Block (current_block, loc, Location.Null);
else
implicit_block = current_block;
Block implicit_block;
if (current_block.Used)
- implicit_block = new Block (current_block, Block.Flags.Implicit);
+ implicit_block = new Block (current_block);
else
implicit_block = current_block;
void
start_block (Location loc)
{
- if (parsing_anonymous_method) {
- top_current_block = new ToplevelBlock (
- current_block, current_local_parameters, current_generic_method, loc);
- if (current_block != null)
- current_block.AddAnonymousChild ((ToplevelBlock) top_current_block);
- current_block = top_current_block;
+ if (current_block == null || parsing_anonymous_method) {
+ current_block = new ToplevelBlock (current_block, current_local_parameters, current_generic_method, loc);
parsing_anonymous_method = false;
- } else if (current_block == null) {
- current_block = new ToplevelBlock (
- (ToplevelBlock) top_current_block, current_local_parameters,
- current_generic_method, loc);
- top_current_block = current_block;
} else {
- current_block = new Block (current_block, loc, Location.Null);
+ current_block = new ExplicitBlock (current_block, loc, Location.Null);
}
}
Block
end_block (Location loc)
{
- Block retval;
-
- while (current_block.Implicit)
- current_block = current_block.Parent;
- retval = current_block;
- current_block.SetEndLocation (loc);
- current_block = current_block.Parent;
- if (current_block == null)
- top_current_block = null;
+ Block retval = current_block.Explicit;
+ retval.SetEndLocation (loc);
+ current_block = retval.Parent;
return retval;
}
current_local_parameters = parameters;
- // Force the next block to be created as a ToplevelBlock
- oob_stack.Push (current_block);
- oob_stack.Push (top_current_block);
+ ToplevelBlock top_current_block = current_block == null ? null : current_block.Toplevel;
current_anonymous_method = lambda
? new LambdaExpression (
current_anonymous_method, current_generic_method, current_container,
- parameters, (ToplevelBlock) top_current_block, loc)
+ parameters, top_current_block, loc)
: new AnonymousMethodExpression (
current_anonymous_method, current_generic_method, current_container,
- parameters, (ToplevelBlock) top_current_block, loc);
+ parameters, top_current_block, loc);
+ // Force the next block to be created as a ToplevelBlock
parsing_anonymous_method = true;
}
{
AnonymousMethodExpression retval;
- top_current_block = (Block) oob_stack.Pop ();
- current_block = (Block) oob_stack.Pop ();
-
if (RootContext.Version == LanguageVersion.ISO_1){
Report.FeatureIsNotISO1 (loc, "anonymous methods");
retval = null;
} else {
- anon_block.Parent = current_block;
-
current_anonymous_method.Block = anon_block;
if ((anonymous_host != null) && (current_anonymous_method.Parent == null))
anonymous_host.AddAnonymousMethod (current_anonymous_method);
projects / mono.git / blobdiff