public class CSharpParser {
NamespaceEntry current_namespace;
TypeContainer current_container;
- TypeContainer current_class;
+ DeclSpace current_class;
- IIteratorContainer iterator_container;
+ IAnonymousHost anonymous_host;
/// <summary>
/// Current block is used to add statements as we find
Delegate current_delegate;
+ GenericMethod current_generic_method;
+ AnonymousMethodExpression current_anonymous_method;
+
/// <summary>
/// This is used by the unary_expression code to resolve
/// a name against a parameter.
Expression implicit_value_parameter_type;
Parameters indexer_parameters;
+ /// <summary>
+ /// Hack to help create non-typed array initializer
+ /// </summary>
+ public static Expression current_array_type;
+ Expression pushed_current_array_type;
+
/// <summary>
/// Used to determine if we are parsing the get/set pair
/// of an indexer or a property
/// </summmary>
- bool parsing_indexer;
+ bool parsing_indexer;
+
+ bool parsing_anonymous_method;
///
/// An out-of-band stack.
;
outer_declaration
- : using_directive
+ : extern_alias_directive
+ | using_directive
| namespace_member_declaration
;
-
+
+extern_alias_directives
+ : extern_alias_directive
+ | extern_alias_directives extern_alias_directive;
+
+extern_alias_directive
+ : EXTERN IDENTIFIER IDENTIFIER SEMICOLON
+ {
+ LocatedToken lt = (LocatedToken) $2;
+ string s = lt.Value;
+ if (s != "alias"){
+ Report.Error (1003, lt.Location, "'alias' expected");
+ } else if (RootContext.Version == LanguageVersion.ISO_1) {
+ Report.FeatureIsNotStandardized (lt.Location, "external alias");
+ } else {
+ lt = (LocatedToken) $3;
+ current_namespace.UsingExternalAlias (lt.Value, lt.Location);
+ }
+ }
+ ;
+
using_directives
: using_directive
| using_directives using_directive
syntax_error (lexer.Location, "namespace name expected");
current_namespace = new NamespaceEntry (
- current_namespace, file, name.GetName (), name.Location);
+ current_namespace, file, name.GetName ());
+ current_class = current_namespace.SlaveDeclSpace;
+ current_container = current_class.PartialContainer;
}
namespace_body opt_semicolon
{
current_namespace = current_namespace.Parent;
+ current_class = current_namespace.SlaveDeclSpace;
+ current_container = current_class.PartialContainer;
}
;
if (RootContext.Documentation != null)
Lexer.doc_state = XmlCommentState.Allowed;
}
+ opt_extern_alias_directives
opt_using_directives
opt_namespace_member_declarations
CLOSE_BRACE
| using_directives
;
+opt_extern_alias_directives
+ : /* empty */
+ | extern_alias_directives
+ ;
+
opt_namespace_member_declarations
: /* empty */
| namespace_member_declarations
"'<' unexpected: attributes cannot be generic");
}
- ArrayList arguments = (ArrayList) $2;
+ object [] arguments = (object []) $2;
MemberName left = mname.Left;
string identifier = mname.Name;
if (current_attr_target == "assembly" || current_attr_target == "module")
// FIXME: supply "nameEscaped" parameter here.
- $$ = new GlobalAttribute (current_class, current_attr_target,
+ $$ = new GlobalAttribute (current_namespace, current_attr_target,
left_expr, identifier, arguments, mname.Location, lexer.IsEscapedIdentifier (mname.Location));
else
$$ = new Attribute (current_attr_target, left_expr, identifier, arguments, mname.Location, lexer.IsEscapedIdentifier (mname.Location));
if ($1 == null)
$$ = null;
else {
- ArrayList args = new ArrayList (4);
- args.Add ($1);
-
- $$ = args;
+ $$ = new object [] { $1, null };
}
}
- | positional_argument_list COMMA named_argument_list
+ | positional_argument_list COMMA named_argument_list
{
- ArrayList args = new ArrayList (4);
- args.Add ($1);
- args.Add ($3);
-
- $$ = args;
+ $$ = new object[] { $1, $3 };
}
- | named_argument_list
+ | named_argument_list
{
- ArrayList args = new ArrayList (4);
- args.Add (null);
- args.Add ($1);
-
- $$ = args;
+ $$ = new object [] { null, $1 };
}
- ;
+ ;
opt_positional_argument_list
member_name
{
MemberName name = MakeName ((MemberName) $6);
- if ($3 != null) {
- ClassPart part = PartialContainer.CreatePart (
- current_namespace, current_class, name, (int) $2,
- (Attributes) $1, Kind.Struct, (Location) $3);
-
- current_container = part.PartialContainer;
- current_class = part;
- } else {
- current_class = new Struct (
- current_namespace, current_class, name, (int) $2,
- (Attributes) $1);
-
- current_container.AddClassOrStruct (current_class);
- current_container = current_class;
- RootContext.Tree.RecordDecl (current_namespace.NS, name, current_class);
- }
+ push_current_class (new Struct (
+ current_namespace, current_class, name, (int) $2,
+ (Attributes) $1), false, $3);
}
opt_class_base
opt_type_parameter_constraints_clauses
lexer.ConstraintsParsing = false;
if ($8 != null)
- current_class.Bases = (ArrayList) $8;
+ current_container.AddBasesForPart (current_class, (ArrayList) $8);
current_class.SetParameterInfo ((ArrayList) $9);
if (RootContext.Documentation != null)
- current_class.DocComment = Lexer.consume_doc_comment ();
+ current_container.DocComment = Lexer.consume_doc_comment ();
}
struct_body
{
Expression type = (Expression) $3;
int mod = (int) $2;
+ current_array_type = null;
+
foreach (VariableDeclaration var in (ArrayList) $4){
Field field = new Field (current_class, type, mod, var.identifier,
- var.expression_or_array_initializer,
(Attributes) $1, var.Location);
+ field.Initializer = var.expression_or_array_initializer;
+
if (RootContext.Documentation != null) {
field.DocComment = Lexer.consume_doc_comment ();
Lexer.doc_state = XmlCommentState.Allowed;
Expression type = (Expression) $4;
int mod = (int) $2;
+ current_array_type = null;
+
foreach (VariableDeclaration var in (ArrayList) $5) {
FixedField field = new FixedField (current_class, type, mod, var.identifier,
(Expression)var.expression_or_array_initializer, (Attributes) $1, var.Location);
VOID
variable_declarators
SEMICOLON {
+ current_array_type = null;
Report.Error (670, (Location) $3, "Fields cannot have void type");
}
;
{
$$ = new VariableDeclaration ((LocatedToken) $1, $3);
}
+ | IDENTIFIER OPEN_BRACKET CLOSE_BRACKET
+ {
+ Report.Error (443, lexer.Location, "Value or constant expected");
+ $$ = new VariableDeclaration ((LocatedToken) $1, null);
+ }
;
variable_declarators
{
$$ = new StackAlloc ((Expression) $2, (Expression) $4, (Location) $1);
}
+ | ARGLIST
+ {
+ $$ = new ArglistAccess ((Location) $1);
+ }
| STACKALLOC type
{
Report.Error (1575, (Location) $1, "A stackalloc expression requires [] after type");
method_declaration
: method_header {
- iterator_container = (IIteratorContainer) $1;
+ anonymous_host = (IAnonymousHost) $1;
if (RootContext.Documentation != null)
Lexer.doc_state = XmlCommentState.NotAllowed;
}
method.Block = (ToplevelBlock) $3;
current_container.AddMethod (method);
+ anonymous_host = null;
+ current_generic_method = null;
current_local_parameters = null;
- iterator_container = null;
if (RootContext.Documentation != null)
Lexer.doc_state = XmlCommentState.Allowed;
if ($9 != null && name.TypeArguments == null)
Report.Error (80, lexer.Location,
- "Contraints are not allowed on non-generic declarations");
+ "Constraints are not allowed on non-generic declarations");
Method method;
GenericMethod generic = null;
if (name.TypeArguments != null) {
- generic = new GenericMethod (current_namespace, current_class, name);
+ generic = new GenericMethod (current_namespace, current_class, name,
+ (Expression) $3, (Parameters) $6);
generic.SetParameterInfo ((ArrayList) $9);
}
method = new Method (current_class, generic, (Expression) $3, (int) $2, false,
name, (Parameters) $6, (Attributes) $1);
+ anonymous_host = method;
current_local_parameters = (Parameters) $6;
+ current_generic_method = generic;
if (RootContext.Documentation != null)
method.DocComment = Lexer.consume_doc_comment ();
if ($9 != null && name.TypeArguments == null)
Report.Error (80, lexer.Location,
- "Contraints are not allowed on non-generic declarations");
+ "Constraints are not allowed on non-generic declarations");
Method method;
GenericMethod generic = null;
if (name.TypeArguments != null) {
- generic = new GenericMethod (current_namespace, current_class, name);
+ generic = new GenericMethod (current_namespace, current_class, name,
+ TypeManager.system_void_expr, (Parameters) $6);
generic.SetParameterInfo ((ArrayList) $9);
}
method = new Method (current_class, generic, TypeManager.system_void_expr,
(int) $2, false, name, (Parameters) $6, (Attributes) $1);
+ anonymous_host = method;
current_local_parameters = (Parameters) $6;
+ current_generic_method = generic;
if (RootContext.Documentation != null)
method.DocComment = Lexer.consume_doc_comment ();
Parameter [] pars = new Parameter [pars_list.Count];
pars_list.CopyTo (pars);
- $$ = new Parameters (pars, null);
+ $$ = new Parameters (pars);
}
| fixed_parameters COMMA parameter_array
{
ArrayList pars_list = (ArrayList) $1;
+ pars_list.Add ($3);
Parameter [] pars = new Parameter [pars_list.Count];
pars_list.CopyTo (pars);
- $$ = new Parameters (pars, (Parameter) $3);
+ $$ = new Parameters (pars);
}
| fixed_parameters COMMA ARGLIST
{
ArrayList pars_list = (ArrayList) $1;
+ //pars_list.Add (new ArglistParameter (GetLocation ($3)));
Parameter [] pars = new Parameter [pars_list.Count];
pars_list.CopyTo (pars);
$$ = new Parameters (pars, true);
}
- | parameter_array COMMA fixed_parameters
+ | parameter_array COMMA error
{
if ($1 != null)
Report.Error (231, ((Parameter) $1).Location, "A params parameter must be the last parameter in a formal parameter list");
$$ = null;
}
- | ARGLIST COMMA fixed_parameters
+ | fixed_parameters COMMA parameter_array COMMA error
+ {
+ if ($3 != null)
+ Report.Error (231, ((Parameter) $3).Location, "A params parameter must be the last parameter in a formal parameter list");
+ $$ = null;
+ }
+ | ARGLIST COMMA error
{
Report.Error (257, (Location) $1, "An __arglist parameter must be the last parameter in a formal parameter list");
$$ = null;
}
+ | fixed_parameters COMMA ARGLIST COMMA error
+ {
+ Report.Error (257, (Location) $3, "An __arglist parameter must be the last parameter in a formal parameter list");
+ $$ = null;
+ }
| parameter_array
{
- $$ = new Parameters (null, (Parameter) $1);
+ $$ = new Parameters (new Parameter[] { (Parameter) $1 } );
}
| ARGLIST
{
- $$ = new Parameters (null, true);
+ $$ = new Parameters (new Parameter[0], true);
}
;
;
parameter_modifier
- : REF { $$ = Parameter.Modifier.REF | Parameter.Modifier.ISBYREF; }
- | OUT { $$ = Parameter.Modifier.OUT | Parameter.Modifier.ISBYREF; }
+ : REF { $$ = Parameter.Modifier.REF; }
+ | OUT { $$ = Parameter.Modifier.OUT; }
;
parameter_array
: opt_attributes PARAMS type IDENTIFIER
{
LocatedToken lt = (LocatedToken) $4;
- $$ = new Parameter ((Expression) $3, lt.Value, Parameter.Modifier.PARAMS, (Attributes) $1, lt.Location);
+ $$ = new ParamsParameter ((Expression) $3, lt.Value, (Attributes) $1, lt.Location);
note ("type must be a single-dimension array type");
}
| opt_attributes PARAMS parameter_modifier type IDENTIFIER
current_local_parameters = indexer_parameters;
lexer.PropertyParsing = false;
- iterator_container = SimpleIteratorContainer.GetSimple ();
+ anonymous_host = SimpleAnonymousHost.GetSimple ();
}
accessor_body
{
current_local_parameters = null;
lexer.PropertyParsing = true;
- if (SimpleIteratorContainer.Simple.Yields)
- accessor.SetYields ();
-
- iterator_container = null;
+ SimpleAnonymousHost.Simple.Propagate (accessor);
+ anonymous_host = null;
if (RootContext.Documentation != null)
if (Lexer.doc_state == XmlCommentState.Error)
if (parsing_indexer == false) {
args = new Parameter [1];
args [0] = implicit_value_parameter;
- current_local_parameters = new Parameters (args, null);
+ current_local_parameters = new Parameters (args);
} else {
Parameter [] fpars = indexer_parameters.FixedParameters;
} else
args = null;
current_local_parameters = new Parameters (
- args, indexer_parameters.ArrayParameter);
+ args);
}
lexer.PropertyParsing = false;
- iterator_container = SimpleIteratorContainer.GetSimple ();
+ anonymous_host = SimpleAnonymousHost.GetSimple ();
}
accessor_body
{
current_local_parameters = null;
lexer.PropertyParsing = true;
- if (SimpleIteratorContainer.Simple.Yields)
- accessor.SetYields ();
-
- iterator_container = null;
+ SimpleAnonymousHost.Simple.Propagate (accessor);
+ anonymous_host = null;
if (RootContext.Documentation != null
&& Lexer.doc_state == XmlCommentState.Error)
{
MemberName name = MakeName ((MemberName) $6);
- if ($3 != null) {
- ClassPart part = PartialContainer.CreatePart (
- current_namespace, current_class, name, (int) $2,
- (Attributes) $1, Kind.Interface, (Location) $3);
-
- current_container = part.PartialContainer;
- current_class = part;
- } else {
- current_class = new Interface (
- current_namespace, current_class, name, (int) $2,
- (Attributes) $1);
-
- current_container.AddInterface (current_class);
- current_container = current_class;
- RootContext.Tree.RecordDecl (current_namespace.NS, name, current_class);
- }
+ push_current_class (new Interface (
+ current_namespace, current_class, name, (int) $2,
+ (Attributes) $1), true, $3);
}
opt_class_base
opt_type_parameter_constraints_clauses
lexer.ConstraintsParsing = false;
if ($8 != null)
- current_class.Bases = (ArrayList) $8;
+ current_container.AddBasesForPart (current_class, (ArrayList) $8);
current_class.SetParameterInfo ((ArrayList) $9);
if (RootContext.Documentation != null) {
- current_class.DocComment = Lexer.consume_doc_comment ();
+ current_container.DocComment = Lexer.consume_doc_comment ();
Lexer.doc_state = XmlCommentState.Allowed;
}
}
opt_statement_list CLOSE_BRACE
{
Report.Error (531, lexer.Location,
- "'{0}': interface members cannot have a definition", $4);
+ "'{0}': interface members cannot have a definition", ((MemberName) $-1).ToString ());
$$ = null;
}
| SEMICOLON
lexer.ConstraintsParsing = true;
}
opt_type_parameter_constraints_clauses
+ {
+ // Refer to the name as $-1 in interface_method_declaration_body
+ $$ = $4;
+ }
interface_method_declaration_body
{
lexer.ConstraintsParsing = false;
if ($9 != null && name.TypeArguments == null)
Report.Error (80, lexer.Location,
- "Contraints are not allowed on non-generic declarations");
+ "Constraints are not allowed on non-generic declarations");
GenericMethod generic = null;
if (name.TypeArguments != null) {
- generic = new GenericMethod (current_namespace, current_class, name);
+ generic = new GenericMethod (current_namespace, current_class, name,
+ (Expression) $3, (Parameters) $6);
generic.SetParameterInfo ((ArrayList) $9);
}
lexer.ConstraintsParsing = true;
}
opt_type_parameter_constraints_clauses
+ {
+ $$ = $4;
+ }
interface_method_declaration_body
{
lexer.ConstraintsParsing = false;
if ($9 != null && name.TypeArguments == null)
Report.Error (80, lexer.Location,
- "Contraints are not allowed on non-generic declarations");
+ "Constraints are not allowed on non-generic declarations");
GenericMethod generic = null;
if (name.TypeArguments != null) {
- generic = new GenericMethod (current_namespace, current_class, name);
+ generic = new GenericMethod (current_namespace, current_class, name,
+ TypeManager.system_void_expr, (Parameters) $6);
generic.SetParameterInfo ((ArrayList) $9);
}
type IDENTIFIER
OPEN_BRACE
{ lexer.PropertyParsing = true; }
- interface_accessors
- { lexer.PropertyParsing = false; }
+ accessor_declarations
+ {
+ has_get = has_set = false;
+ lexer.PropertyParsing = false;
+ }
CLOSE_BRACE
{
LocatedToken lt = (LocatedToken) $4;
break;
}
+ Property p = null;
if ($7 == null) {
- Property p = new Property (current_class, (Expression) $3, (int) $2, true,
+ p = new Property (current_class, (Expression) $3, (int) $2, true,
name, (Attributes) $1,
null, null);
- Report.Error (548, lexer.Location, "`{0}': property or indexer must have at least one accessor", p.GetSignatureForError ());
+ Report.Error (548, p.Location, "`{0}': property or indexer must have at least one accessor", p.GetSignatureForError ());
break;
}
- InterfaceAccessorInfo pinfo = (InterfaceAccessorInfo) $7;
-
- $$ = new Property (current_class, (Expression) $3, (int) $2, true,
+ Pair pair = (Pair) $7;
+ p = new Property (current_class, (Expression) $3, (int) $2, true,
name, (Attributes) $1,
- pinfo.Get, pinfo.Set);
+ (Accessor)pair.First, (Accessor)pair.Second);
+
+ if (pair.First != null && ((Accessor)(pair.First)).Block != null) {
+ Report.Error (531, p.Location, "`{0}.get': interface members cannot have a definition", p.GetSignatureForError ());
+ $$ = null;
+ break;
+ }
+
+ if (pair.Second != null && ((Accessor)(pair.Second)).Block != null) {
+ Report.Error (531, p.Location, "`{0}.set': interface members cannot have a definition", p.GetSignatureForError ());
+ $$ = null;
+ break;
+ }
+
if (RootContext.Documentation != null)
- ((Property) $$).DocComment = Lexer.consume_doc_comment ();
+ p.DocComment = Lexer.consume_doc_comment ();
+
+ $$ = p;
}
| opt_attributes
opt_new
}
;
-interface_accessors
- : opt_attributes opt_modifiers GET SEMICOLON
- {
- $$ = new InterfaceAccessorInfo (true, false, (Attributes) $1, null, (int) $2, 0, (Location) $3, (Location) $3);
- }
- | opt_attributes opt_modifiers GET OPEN_BRACE
- {
- Report.Error (531, (Location) $3, "`{0}': interface members cannot have a definition", ".get");
- $$ = new InterfaceAccessorInfo (true, false, (Attributes) $1, null, (int) $2, 0, (Location) $3, (Location) $3);
- }
- | opt_attributes opt_modifiers SET SEMICOLON
- {
- $$ = new InterfaceAccessorInfo (false, true, null, (Attributes) $1, 0, (int) $2, (Location) $3, (Location) $3);
- }
- | opt_attributes opt_modifiers GET SEMICOLON opt_attributes opt_modifiers SET SEMICOLON
- {
- $$ = new InterfaceAccessorInfo (true, true, (Attributes) $1, (Attributes) $5, (int) $2, (int) $6, (Location) $3, (Location) $7);
- }
- | opt_attributes opt_modifiers SET SEMICOLON opt_attributes opt_modifiers GET SEMICOLON
- {
- $$ = new InterfaceAccessorInfo (true, true, (Attributes) $5, (Attributes) $1, (int) $6, (int) $2, (Location) $3, (Location) $3);
- }
- |
- {
- $$ = null;
- }
- ;
interface_event_declaration
: opt_attributes opt_new EVENT type IDENTIFIER SEMICOLON
{
LocatedToken lt = (LocatedToken) $5;
$$ = new EventField (current_class, (Expression) $4, (int) $2, true,
- new MemberName (lt.Value, lt.Location), null,
+ new MemberName (lt.Value, lt.Location),
(Attributes) $1);
if (RootContext.Documentation != null)
((EventField) $$).DocComment = Lexer.consume_doc_comment ();
OPEN_BRACKET formal_parameter_list CLOSE_BRACKET
OPEN_BRACE
{ lexer.PropertyParsing = true; }
- interface_accessors
- { lexer.PropertyParsing = false; }
+ accessor_declarations
+ {
+ has_get = has_set = false;
+ lexer.PropertyParsing = false;
+ }
CLOSE_BRACE
{
+ Indexer i = null;
if ($10 == null) {
- Indexer i = new Indexer (current_class, (Expression) $3,
+ i = new Indexer (current_class, (Expression) $3,
new MemberName (TypeContainer.DefaultIndexerName, (Location) $4),
(int) $2, true, (Parameters) $6, (Attributes) $1,
null, null);
- Report.Error (548, lexer.Location, "`{0}': property or indexer must have at least one accessor", i.GetSignatureForError ());
+ Report.Error (548, i.Location, "`{0}': property or indexer must have at least one accessor", i.GetSignatureForError ());
break;
}
- InterfaceAccessorInfo info = (InterfaceAccessorInfo) $10;
-
- $$ = new Indexer (current_class, (Expression) $3,
+ Pair pair = (Pair) $10;
+ i = new Indexer (current_class, (Expression) $3,
new MemberName (TypeContainer.DefaultIndexerName, (Location) $4),
(int) $2, true, (Parameters) $6, (Attributes) $1,
- info.Get, info.Set);
+ (Accessor)pair.First, (Accessor)pair.Second);
+
+ if (pair.First != null && ((Accessor)(pair.First)).Block != null) {
+ Report.Error (531, i.Location, "`{0}.get': interface members cannot have a definition", i.GetSignatureForError ());
+ $$ = null;
+ break;
+ }
+
+ if (pair.Second != null && ((Accessor)(pair.Second)).Block != null) {
+ Report.Error (531, i.Location, "`{0}.set': interface members cannot have a definition", i.GetSignatureForError ());
+ $$ = null;
+ break;
+ }
+
if (RootContext.Documentation != null)
- ((Indexer) $$).DocComment = ConsumeStoredComment ();
+ i.DocComment = ConsumeStoredComment ();
+
+ $$ = i;
}
;
operator_declaration
: opt_attributes opt_modifiers operator_declarator
{
- iterator_container = SimpleIteratorContainer.GetSimple ();
+ anonymous_host = SimpleAnonymousHost.GetSimple ();
}
operator_body
{
Operator op = new Operator (
current_class, decl.optype, decl.ret_type, (int) $2,
- new Parameters (param_list, null),
+ new Parameters (param_list),
(ToplevelBlock) $5, (Attributes) $1, decl.location);
if (RootContext.Documentation != null) {
Lexer.doc_state = XmlCommentState.Allowed;
}
- if (SimpleIteratorContainer.Simple.Yields)
- op.SetYields ();
+ SimpleAnonymousHost.Simple.Propagate (op);
+ anonymous_host = null;
// Note again, checking is done in semantic analysis
current_container.AddOperator (op);
current_local_parameters = null;
- iterator_container = null;
}
;
pars [0] = new Parameter (type, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
- current_local_parameters = new Parameters (pars, null);
+ current_local_parameters = new Parameters (pars);
if (RootContext.Documentation != null) {
tmpComment = Lexer.consume_doc_comment ();
pars [0] = new Parameter (typeL, ltParam1.Value, Parameter.Modifier.NONE, null, ltParam1.Location);
pars [1] = new Parameter (typeR, ltParam2.Value, Parameter.Modifier.NONE, null, ltParam2.Location);
- current_local_parameters = new Parameters (pars, null);
+ current_local_parameters = new Parameters (pars);
if (RootContext.Documentation != null) {
tmpComment = Lexer.consume_doc_comment ();
pars [0] = new Parameter ((Expression) $5, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
- current_local_parameters = new Parameters (pars, null);
+ current_local_parameters = new Parameters (pars);
if (RootContext.Documentation != null) {
tmpComment = Lexer.consume_doc_comment ();
pars [0] = new Parameter ((Expression) $5, lt.Value, Parameter.Modifier.NONE, null, lt.Location);
- current_local_parameters = new Parameters (pars, null);
+ current_local_parameters = new Parameters (pars);
if (RootContext.Documentation != null) {
tmpComment = Lexer.consume_doc_comment ();
"`{0}': static constructor cannot have an explicit `this' or `base' constructor call",
c.GetSignatureForError ());
}
-
- if (!c.Parameters.Empty){
- Report.Error (132, c.Location,
- "`{0}': The static constructor must be parameterless", c.GetSignatureForError ());
- }
} else {
c.ModFlags = Modifiers.Check (Constructor.AllowedModifiers, (int) $2, Modifiers.PRIVATE, c.Location);
}
LocatedToken lt = (LocatedToken) $1;
$$ = new Constructor (current_class, lt.Value, 0, (Parameters) $4,
(ConstructorInitializer) $7, lt.Location);
+
+ anonymous_host = (IAnonymousHost) $$;
}
;
Method d = new Destructor (
current_class, TypeManager.system_void_expr, m, "Finalize",
- new Parameters (null, null), (Attributes) $1, l);
+ Parameters.EmptyReadOnlyParameters, (Attributes) $1, l);
if (RootContext.Documentation != null)
d.DocComment = ConsumeStoredComment ();
opt_modifiers
EVENT type variable_declarators SEMICOLON
{
+ current_array_type = null;
foreach (VariableDeclaration var in (ArrayList) $5) {
MemberName name = new MemberName (var.identifier,
var.Location);
- Event e = new EventField (
+ EventField e = new EventField (
current_class, (Expression) $4, (int) $2, false, name,
- var.expression_or_array_initializer, (Attributes) $1);
+ (Attributes) $1);
+
+ e.Initializer = var.expression_or_array_initializer;
current_container.AddEvent (e);
if ($8 == null){
Report.Error (65, (Location) $3, "`{0}.{1}': event property must have both add and remove accessors",
- current_container.Name, name);
+ current_container.Name, name.ToString ());
$$ = null;
} else {
Pair pair = (Pair) $8;
$$ = null;
else {
Event e = new EventProperty (
- current_class, (Expression) $4, (int) $2, false, name, null,
+ current_class, (Expression) $4, (int) $2, false, name,
(Attributes) $1, (Accessor) pair.First, (Accessor) pair.Second);
if (RootContext.Documentation != null) {
e.DocComment = Lexer.consume_doc_comment ();
args [0] = implicit_value_parameter;
- current_local_parameters = new Parameters (args, null);
+ current_local_parameters = new Parameters (args);
lexer.EventParsing = false;
}
block
args [0] = implicit_value_parameter;
- current_local_parameters = new Parameters (args, null);
+ current_local_parameters = new Parameters (args);
lexer.EventParsing = false;
}
block
parsing_indexer = true;
indexer_parameters = decl.param_list;
- iterator_container = SimpleIteratorContainer.GetSimple ();
+ anonymous_host = SimpleAnonymousHost.GetSimple ();
}
accessor_declarations
{
if (pars.HasArglist) {
// "__arglist is not valid in this context"
Report.Error (1669, (Location) $2, "__arglist is not valid in this context");
- } else if (pars.FixedParameters == null && pars.ArrayParameter == null){
+ } else if (pars.Empty){
Report.Error (1551, (Location) $2, "Indexers must have at least one parameter");
}
if (RootContext.Documentation != null) {
if (pars.HasArglist) {
// "__arglist is not valid in this context"
Report.Error (1669, (Location) $4, "__arglist is not valid in this context");
- } else if (pars.FixedParameters == null && pars.ArrayParameter == null){
+ } else if (pars.Empty){
Report.Error (1551, (Location) $4, "Indexers must have at least one parameter");
}
}
current_container.AddEnum (e);
- RootContext.Tree.RecordDecl (current_namespace.NS, name, e);
$$ = e;
}
OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS
{
MemberName name = MakeName ((MemberName) $6);
+ Parameters p = (Parameters) $8;
+ if (p.HasArglist) {
+ // TODO: wrong location
+ Report.Error (1669, name.Location, "__arglist is not valid in this context");
+ }
+
Delegate del = new Delegate (current_namespace, current_class, (Expression) $5,
- (int) $2, name, (Parameters) $8, (Attributes) $1);
+ (int) $2, name, p, (Attributes) $1);
if (RootContext.Documentation != null) {
del.DocComment = Lexer.consume_doc_comment ();
}
current_container.AddDelegate (del);
- RootContext.Tree.RecordDecl (current_namespace.NS, name, del);
-
current_delegate = del;
}
opt_type_parameter_constraints_clauses
;
type_arguments
- : type {
+ : opt_attributes type {
TypeArguments type_args = new TypeArguments (lexer.Location);
- type_args.Add ((Expression) $1);
+ if ($1 != null) {
+ SimpleName sn = $2 as SimpleName;
+ if (sn == null)
+ Report.Error (1031, lexer.Location, "Type expected");
+ else
+ $2 = new TypeParameterName (sn.Name, (Attributes) $1, lexer.Location);
+ }
+ type_args.Add ((Expression) $2);
$$ = type_args;
}
- | type_arguments COMMA type {
+ | type_arguments COMMA opt_attributes type {
TypeArguments type_args = (TypeArguments) $1;
- type_args.Add ((Expression) $3);
+ if ($3 != null) {
+ SimpleName sn = $4 as SimpleName;
+ if (sn == null)
+ Report.Error (1031, lexer.Location, "Type expected");
+ else
+ $4 = new TypeParameterName (sn.Name, (Attributes) $3, lexer.Location);
+ }
+ type_args.Add ((Expression) $4);
$$ = type_args;
}
;
+
/*
* Before you think of adding a return_type, notice that we have been
// can't perform checks during this phase - we do it during
// semantic analysis.
//
- $$ = new ComposedCast ((Expression) $1, "*");
+ $$ = new ComposedCast ((Expression) $1, "*", Lexer.Location);
}
| VOID STAR
{
}
| non_expression_type rank_specifier
{
- $$ = new ComposedCast ((Expression) $1, (string) $2);
+ Location loc = GetLocation ($1);
+ if (loc.IsNull)
+ loc = lexer.Location;
+ $$ = new ComposedCast ((Expression) $1, (string) $2, loc);
}
| non_expression_type STAR
{
- $$ = new ComposedCast ((Expression) $1, "*");
+ Location loc = GetLocation ($1);
+ if (loc.IsNull)
+ loc = lexer.Location;
+ $$ = new ComposedCast ((Expression) $1, "*", loc);
}
| expression rank_specifiers
{
if ((bool) $3)
rank_specifiers += "?";
- $$ = new ComposedCast ((Expression) $1, rank_specifiers);
+ $$ = current_array_type = new ComposedCast ((Expression) $1, rank_specifiers);
}
;
: boolean_literal
| integer_literal
| real_literal
- | LITERAL_CHARACTER { $$ = new CharLiteral ((char) lexer.Value); }
- | LITERAL_STRING { $$ = new StringLiteral ((string) lexer.Value); }
- | NULL { $$ = NullLiteral.Null; }
+ | LITERAL_CHARACTER { $$ = new CharLiteral ((char) lexer.Value, lexer.Location); }
+ | LITERAL_STRING { $$ = new StringLiteral ((string) lexer.Value, lexer.Location); }
+ | NULL { $$ = new NullLiteral (lexer.Location); }
;
real_literal
- : LITERAL_FLOAT { $$ = new FloatLiteral ((float) lexer.Value); }
- | LITERAL_DOUBLE { $$ = new DoubleLiteral ((double) lexer.Value); }
- | LITERAL_DECIMAL { $$ = new DecimalLiteral ((decimal) lexer.Value); }
+ : LITERAL_FLOAT { $$ = new FloatLiteral ((float) lexer.Value, lexer.Location); }
+ | LITERAL_DOUBLE { $$ = new DoubleLiteral ((double) lexer.Value, lexer.Location); }
+ | LITERAL_DECIMAL { $$ = new DecimalLiteral ((decimal) lexer.Value, lexer.Location); }
;
integer_literal
object v = lexer.Value;
if (v is int){
- int i = (int) v;
-
- if (i == 0)
- $$ = IntLiteral.Zero;
- else if (i == 1)
- $$ = IntLiteral.One;
- else
- $$ = new IntLiteral (i);
+ $$ = new IntLiteral ((int) v, lexer.Location);
} else if (v is uint)
- $$ = new UIntLiteral ((UInt32) v);
+ $$ = new UIntLiteral ((UInt32) v, lexer.Location);
else if (v is long)
- $$ = new LongLiteral ((Int64) v);
+ $$ = new LongLiteral ((Int64) v, lexer.Location);
else if (v is ulong)
- $$ = new ULongLiteral ((UInt64) v);
+ $$ = new ULongLiteral ((UInt64) v, lexer.Location);
else
Console.WriteLine ("OOPS. Unexpected result from scanner");
}
;
boolean_literal
- : TRUE { $$ = new BoolLiteral (true); }
- | FALSE { $$ = new BoolLiteral (false); }
+ : TRUE { $$ = new BoolLiteral (true, lexer.Location); }
+ | FALSE { $$ = new BoolLiteral (false, lexer.Location); }
;
parenthesized_expression_0
: OPEN_PARENS expression CLOSE_PARENS
{
$$ = $2;
- lexer.Deambiguate_CloseParens ();
+ lexer.Deambiguate_CloseParens ($$);
// After this, the next token returned is one of
- // CLOSE_PARENS_CAST, CLOSE_PARENS_NO_CAST, CLOSE_PARENS_OPEN_PARENS
+ // CLOSE_PARENS_CAST, CLOSE_PARENS_NO_CAST (CLOSE_PARENS), CLOSE_PARENS_OPEN_PARENS
// or CLOSE_PARENS_MINUS.
}
+ | OPEN_PARENS expression error { CheckToken (1026, yyToken, "Expecting ')'", lexer.Location); }
;
parenthesized_expression
: parenthesized_expression_0 CLOSE_PARENS_NO_CAST
{
$$ = $1;
- }
+ }
+ | parenthesized_expression_0 CLOSE_PARENS
+ {
+ $$ = $1;
+ }
| parenthesized_expression_0 CLOSE_PARENS_MINUS
{
// If a parenthesized expression is followed by a minus, we need to wrap
// in Binary.DoResolve().
$$ = new ParenthesizedExpression ((Expression) $1);
}
- ;;
+ ;
member_access
: primary_expression DOT IDENTIFIER opt_type_argument_list
{
LocatedToken lt = (LocatedToken) $3;
- $$ = new MemberAccess ((Expression) $1, lt.Value,
- (TypeArguments) $4, lt.Location);
+ $$ = new MemberAccess ((Expression) $1, lt.Value, (TypeArguments) $4, lt.Location);
}
| predefined_type DOT IDENTIFIER opt_type_argument_list
{
LocatedToken lt = (LocatedToken) $3;
- $$ = new MemberAccess ((Expression) $1, lt.Value,
- (TypeArguments) $4, lt.Location);
+ // TODO: Location is wrong as some predefined types doesn't hold a location
+ $$ = new MemberAccess ((Expression) $1, lt.Value, (TypeArguments) $4, lt.Location);
}
;
;
invocation_expression
- : primary_expression {
- $$ = lexer.Location;
- } OPEN_PARENS opt_argument_list CLOSE_PARENS
+ : primary_expression OPEN_PARENS opt_argument_list CLOSE_PARENS
{
- if ($1 == null) {
- Location l = (Location) $3;
- Report.Error (1, l, "Parse error");
- }
- $$ = new Invocation ((Expression) $1, (ArrayList) $4);
+ if ($1 == null)
+ Report.Error (1, (Location) $2, "Parse error");
+ else
+ $$ = new Invocation ((Expression) $1, (ArrayList) $3);
}
| parenthesized_expression_0 CLOSE_PARENS_OPEN_PARENS OPEN_PARENS CLOSE_PARENS
{
//
$$ = new ComposedCast (expr, (string) $2);
}
+ current_array_type = (Expression)$$;
}
;
;
base_access
- : BASE DOT IDENTIFIER
+ : BASE DOT IDENTIFIER opt_type_argument_list
{
LocatedToken lt = (LocatedToken) $3;
- $$ = new BaseAccess (lt.Value, lt.Location);
+ $$ = new BaseAccess (lt.Value, (TypeArguments) $4, lt.Location);
}
| BASE OPEN_BRACKET expression_list CLOSE_BRACKET
{
}
;
-void_pointer_expression
- : void_pointer_expression STAR
- {
- $$ = new ComposedCast ((Expression) $1, "*", lexer.Location);
- }
- | VOID STAR
- {
- $$ = new ComposedCast (TypeManager.system_void_expr, "*", lexer.Location);;
- }
- ;
-
typeof_expression
- : TYPEOF OPEN_PARENS VOID CLOSE_PARENS
- {
- $$ = new TypeOfVoid ((Location) $1);
- }
- | TYPEOF OPEN_PARENS void_pointer_expression CLOSE_PARENS
- {
- $$ = new TypeOf ((Expression) $3, (Location) $1);
- }
- | TYPEOF OPEN_PARENS
- {
- lexer.TypeOfParsing = true;
+ : TYPEOF
+ {
+ pushed_current_array_type = current_array_type;
+ lexer.TypeOfParsing = true;
}
- type CLOSE_PARENS
+ OPEN_PARENS type CLOSE_PARENS
{
- lexer.TypeOfParsing = false;
- $$ = new TypeOf ((Expression) $4, lexer.Location);
+ lexer.TypeOfParsing = false;
+ Expression type = (Expression)$4;
+ if (type == TypeManager.system_void_expr)
+ $$ = new TypeOfVoid ((Location) $1);
+ else
+ $$ = new TypeOf (type, (Location) $1);
+ current_array_type = pushed_current_array_type;
}
;
LocatedToken lt = (LocatedToken) $3;
deref = new Unary (Unary.Operator.Indirection, (Expression) $1, lt.Location);
- $$ = new MemberAccess (deref, lt.Value, lt.Location);
+ $$ = new MemberAccess (deref, lt.Value);
}
;
anonymous_method_expression
: DELEGATE opt_anonymous_method_signature
{
+ if (oob_stack == null)
+ oob_stack = new Stack (6);
+
+ oob_stack.Push (current_anonymous_method);
oob_stack.Push (current_local_parameters);
current_local_parameters = (Parameters)$2;
// Force the next block to be created as a ToplevelBlock
oob_stack.Push (current_block);
oob_stack.Push (top_current_block);
- current_block = null;
- }
+
+ Location loc = (Location) $1;
+ current_anonymous_method = new AnonymousMethodExpression (
+ current_anonymous_method, current_generic_method, current_container,
+ (Parameters) $2, (ToplevelBlock) top_current_block, loc);
+
+ parsing_anonymous_method = true;
+ }
block
{
Location loc = (Location) $1;
top_current_block = (Block) oob_stack.Pop ();
current_block = (Block) oob_stack.Pop ();
+
if (RootContext.Version == LanguageVersion.ISO_1){
Report.FeatureIsNotStandardized (loc, "anonymous methods");
$$ = null;
ToplevelBlock anon_block = (ToplevelBlock) $4;
anon_block.Parent = current_block;
- $$ = new AnonymousMethod ((Parameters) $2, (ToplevelBlock) top_current_block,
- anon_block, loc);
- }
- current_local_parameters = (Parameters) oob_stack.Pop ();
+
+ current_anonymous_method.Block = anon_block;
+ if ((anonymous_host != null) && (current_anonymous_method.Parent == null))
+ anonymous_host.AddAnonymousMethod (current_anonymous_method);
+
+ $$ = current_anonymous_method;
}
+
+ current_local_parameters = (Parameters) oob_stack.Pop ();
+ current_anonymous_method = (AnonymousMethodExpression) oob_stack.Pop ();
+ }
;
opt_anonymous_method_signature
ArrayList par_list = (ArrayList) $2;
Parameter [] pars = new Parameter [par_list.Count];
par_list.CopyTo (pars);
- $$ = new Parameters (pars, null);
+ $$ = new Parameters (pars);
}
}
;
{
$$ = new Cast ((Expression) $1, (Expression) $3);
}
+ | parenthesized_expression_0 CLOSE_PARENS_NO_CAST default_value_expression
+ {
+ $$ = new Cast ((Expression) $1, (Expression) $3);
+ }
| parenthesized_expression_0 CLOSE_PARENS_OPEN_PARENS cast_expression
{
$$ = new Cast ((Expression) $1, (Expression) $3);
: cast_list
| OPEN_PARENS non_expression_type CLOSE_PARENS prefixed_unary_expression
{
- $$ = new Cast ((Expression) $2, (Expression) $4);
+ // TODO: wrong location
+ $$ = new Cast ((Expression) $2, (Expression) $4, lexer.Location);
}
;
MemberName name = MakeName ((MemberName) $6);
int mod_flags = (int) $2;
- if ($3 != null) {
- ClassPart part = PartialContainer.CreatePart (
- current_namespace, current_class, name, mod_flags,
- (Attributes) $1, Kind.Class, (Location) $3);
-
- current_container = part.PartialContainer;
- current_class = part;
- } else {
- if ((mod_flags & Modifiers.STATIC) != 0) {
- current_class = new StaticClass (
- current_namespace, current_class, name,
- mod_flags, (Attributes) $1);
- } else {
- current_class = new Class (
- current_namespace, current_class, name,
- mod_flags, (Attributes) $1);
- }
-
- current_container.AddClassOrStruct (current_class);
- current_container = current_class;
- RootContext.Tree.RecordDecl (current_namespace.NS, name, current_class);
- }
+ push_current_class (new Class (
+ current_namespace, current_class, name,
+ mod_flags, (Attributes) $1), false, $3);
}
opt_class_base
opt_type_parameter_constraints_clauses
"The class System.Object cannot have a base " +
"class or implement an interface.");
}
- current_class.Bases = (ArrayList) $8;
+ current_container.AddBasesForPart (current_class, (ArrayList) $8);
}
current_class.SetParameterInfo ((ArrayList) $9);
if (RootContext.Documentation != null) {
- current_class.DocComment = Lexer.consume_doc_comment ();
+ current_container.DocComment = Lexer.consume_doc_comment ();
Lexer.doc_state = XmlCommentState.Allowed;
}
}
}
| type_parameter_constraints_clauses type_parameter_constraints_clause {
ArrayList constraints = (ArrayList) $1;
+ Constraints new_constraint = (Constraints)$2;
- constraints.Add ($2);
+ foreach (Constraints c in constraints) {
+ if (new_constraint.TypeParameter == c.TypeParameter) {
+ Report.Error (409, new_constraint.Location, "A constraint clause has already been specified for type parameter `{0}'",
+ new_constraint.TypeParameter);
+ }
+ }
+
+ constraints.Add (new_constraint);
$$ = constraints;
}
;
block
: OPEN_BRACE
{
- if (current_block == null){
- current_block = new ToplevelBlock ((ToplevelBlock) top_current_block, current_local_parameters, (Location) $1);
+ if (parsing_anonymous_method) {
+ top_current_block = new ToplevelBlock (
+ current_block, current_local_parameters, current_generic_method,
+ (Location) $1);
+ if (current_block != null)
+ current_block.AddAnonymousChild ((ToplevelBlock) top_current_block);
+ current_block = top_current_block;
+ parsing_anonymous_method = false;
+ } else if (current_block == null) {
+ current_block = new ToplevelBlock (
+ (ToplevelBlock) top_current_block, current_local_parameters,
+ current_generic_method, (Location) $1);
top_current_block = current_block;
} else {
current_block = new Block (current_block, (Location) $1, Location.Null);
LocatedToken lt = (LocatedToken) $1;
LabeledStatement labeled = new LabeledStatement (lt.Value, lt.Location);
- if (current_block.AddLabel (lt.Value, labeled, lt.Location))
+ if (current_block.AddLabel (labeled))
current_block.AddStatement (labeled);
}
statement
declaration_statement
: local_variable_declaration SEMICOLON
{
+ current_array_type = null;
if ($1 != null){
DictionaryEntry de = (DictionaryEntry) $1;
Expression e = (Expression) de.Key;
| local_constant_declaration SEMICOLON
{
+ current_array_type = null;
if ($1 != null){
DictionaryEntry de = (DictionaryEntry) $1;
if ((string) $2 == "")
$$ = $1;
else
- $$ = new ComposedCast ((Expression) $1, (string) $2);
+ $$ = current_array_type = new ComposedCast ((Expression) $1, (string) $2, lexer.Location);
}
;
}
| builtin_types STAR
{
- $$ = new ComposedCast ((Expression) $1, "*");
+ $$ = new ComposedCast ((Expression) $1, "*", lexer.Location);
}
| VOID STAR
{
;
expression_statement
- : statement_expression SEMICOLON
- {
- $$ = $1;
- }
+ : statement_expression SEMICOLON { $$ = $1; }
;
//
// because statement_expression is used for example in for_statement
//
statement_expression
- : invocation_expression { $$ = new StatementExpression ((ExpressionStatement) $1); }
- | object_creation_expression { $$ = new StatementExpression ((ExpressionStatement) $1); }
- | assignment_expression { $$ = new StatementExpression ((ExpressionStatement) $1); }
- | post_increment_expression { $$ = new StatementExpression ((ExpressionStatement) $1); }
- | post_decrement_expression { $$ = new StatementExpression ((ExpressionStatement) $1); }
- | pre_increment_expression { $$ = new StatementExpression ((ExpressionStatement) $1); }
- | pre_decrement_expression { $$ = new StatementExpression ((ExpressionStatement) $1); }
- | error {
+ : expression
+ {
+ Expression expr = (Expression) $1;
+ ExpressionStatement s = expr as ExpressionStatement;
+ if (s == null) {
+ Report.Error (201, expr.Location, "Only assignment, call, increment, decrement, and new object expressions can be used as a statement");
+ $$ = null;
+ }
+ $$ = new StatementExpression (s);
+ }
+ | error
+ {
Report.Error (1002, GetLocation ($1), "Expecting `;'");
$$ = null;
}
$$ = new If ((Expression) $3, (Statement) $5, l);
- if (RootContext.WarningLevel >= 3){
- // FIXME: location for warning should be loc property of $5.
- if ($5 == EmptyStatement.Value)
- Report.Warning (642, l, "Possible mistaken empty statement");
- }
+ // FIXME: location for warning should be loc property of $5.
+ if ($5 == EmptyStatement.Value)
+ Report.Warning (642, 3, l, "Possible mistaken empty statement");
}
| IF OPEN_PARENS boolean_expression CLOSE_PARENS
$$ = new If ((Expression) $3, (Statement) $5, (Statement) $7, l);
- if (RootContext.WarningLevel >= 3){
- // FIXME: location for warning should be loc property of $5 and $7.
- if ($5 == EmptyStatement.Value)
- Report.Warning (642, l, "Possible mistaken empty statement");
- if ($7 == EmptyStatement.Value)
- Report.Warning (642, l, "Possible mistaken empty statement");
- }
+ // FIXME: location for warning should be loc property of $5 and $7.
+ if ($5 == EmptyStatement.Value)
+ Report.Warning (642, 3, l, "Possible mistaken empty statement");
+ if ($7 == EmptyStatement.Value)
+ Report.Warning (642, 3, l, "Possible mistaken empty statement");
}
;
switch_statement
: SWITCH OPEN_PARENS
{
+ if (switch_stack == null)
+ switch_stack = new Stack (2);
switch_stack.Push (current_block);
}
expression CLOSE_PARENS
opt_switch_sections
: /* empty */
{
- Report.Error (1522, lexer.Location, "Empty switch block");
+ Report.Warning (1522, 1, lexer.Location, "Empty switch block");
+ $$ = new ArrayList ();
}
| switch_sections
;
continue;
Location l = lexer.Location;
- Expression expr;
- if (decl.expression_or_array_initializer is Expression){
- expr = (Expression) decl.expression_or_array_initializer;
- } else if (decl.expression_or_array_initializer == null) {
- expr = null;
- } else {
- ArrayList init = (ArrayList) decl.expression_or_array_initializer;
- expr = new ArrayCreation (type, "", init, decl.Location);
- }
+ Expression expr = decl.expression_or_array_initializer;
LocalVariableReference var;
var = new LocalVariableReference (assign_block, decl.identifier, l);
: statement_expression
{
// CHANGE: was `null'
- Block b = new Block (current_block, Block.Flags.Implicit);
+ Statement s = (Statement) $1;
+ Block b = new Block (current_block, Block.Flags.Implicit, s.loc, lexer.Location);
- b.AddStatement ((Statement) $1);
+ b.AddStatement (s);
$$ = b;
}
| statement_expression_list COMMA statement_expression
Report.FeatureIsNotStandardized (lt.Location, "yield statement");
$$ = null;
}
- if (iterator_container == null){
+ if (anonymous_host == null){
Report.Error (204, lt.Location, "yield statement can only be used within a method, operator or property");
$$ = null;
} else {
- iterator_container.SetYields ();
+ anonymous_host.SetYields ();
$$ = new Yield ((Expression) $3, lt.Location);
}
}
Report.FeatureIsNotStandardized (lt.Location, "yield statement");
$$ = null;
}
- if (iterator_container == null){
+ if (anonymous_host == null){
Report.Error (204, lt.Location, "yield statement can only be used within a method, operator or property");
$$ = null;
} else {
- iterator_container.SetYields ();
+ anonymous_host.SetYields ();
$$ = new YieldBreak (lt.Location);
}
}
} block {
Expression type = null;
string id = null;
+ Block var_block = null;
if ($2 != null){
DictionaryEntry cc = (DictionaryEntry) $2;
id = lt.Value;
while (current_block.Implicit)
current_block = current_block.Parent;
+ var_block = current_block;
current_block = current_block.Parent;
}
}
- $$ = new Catch (type, id, (Block) $4, ((Block) $4).loc);
+ $$ = new Catch (type, id, (Block) $4, var_block, ((Block) $4).loc);
}
;
continue;
vi.SetReadOnlyContext (LocalInfo.ReadOnlyContext.Using);
- Expression expr;
- if (decl.expression_or_array_initializer is Expression){
- expr = (Expression) decl.expression_or_array_initializer;
- } else {
- ArrayList init = (ArrayList) decl.expression_or_array_initializer;
- if (init == null) {
- Report.Error (210, l, "You must provide an initializer in a fixed or using statement declaration");
- }
-
- expr = new ArrayCreation (type, "", init, decl.Location);
+ Expression expr = decl.expression_or_array_initializer;
+ if (expr == null) {
+ Report.Error (210, l, "You must provide an initializer in a fixed or using statement declaration");
}
LocalVariableReference var;
// </summary>
public class VariableDeclaration {
public string identifier;
- public object expression_or_array_initializer;
+ public Expression expression_or_array_initializer;
public Location Location;
public Attributes OptAttributes;
public string DocComment;
public VariableDeclaration (LocatedToken lt, object eoai, Attributes opt_attrs)
{
this.identifier = lt.Value;
- this.expression_or_array_initializer = eoai;
+ if (eoai is ArrayList) {
+ if (CSharpParser.current_array_type == null)
+ Report.Error (622, lt.Location,
+ "Can only use array initializer expressions to assign to array types. Try using a new expression instead.");
+ this.expression_or_array_initializer = new ArrayCreation (CSharpParser.current_array_type, "", (ArrayList)eoai, lt.Location);
+ } else {
+ this.expression_or_array_initializer = (Expression)eoai;
+ }
this.Location = lt.Location;
this.OptAttributes = opt_attrs;
}
}
}
-/// <summary>
-/// Used to pass around interface property information
-/// </summary>
-public class InterfaceAccessorInfo {
-
- public readonly Accessor Get, Set;
-
- public InterfaceAccessorInfo (bool has_get, bool has_set,
- Attributes get_attrs, Attributes set_attrs, int get_mod, int set_mod, Location get_loc, Location set_loc)
- {
- if (has_get)
- Get = new Accessor (null, get_mod, get_attrs, get_loc);
- if (has_set)
- Set = new Accessor (null, set_mod, set_attrs, set_loc);
- }
-
-}
-
-
// <summary>
// A class used to hold info about an indexer declarator
// </summary>
}
//
-// We use this when we do not have an object in advance that is an IIteratorContainer
+// We use this when we do not have an object in advance that is an IAnonymousHost
//
-public class SimpleIteratorContainer : IIteratorContainer {
- public bool Yields;
+public class SimpleAnonymousHost : IAnonymousHost {
+ public static readonly SimpleAnonymousHost Simple = new SimpleAnonymousHost ();
- public static SimpleIteratorContainer Simple = new SimpleIteratorContainer ();
+ bool yields;
+ ArrayList anonymous_methods;
- //
- // Reset and return
- //
- public static SimpleIteratorContainer GetSimple () {
- Simple.Yields = false;
+ public static SimpleAnonymousHost GetSimple () {
+ Simple.yields = false;
+ Simple.anonymous_methods = null;
return Simple;
}
- public void SetYields () { Yields = true; }
+ public void SetYields ()
+ {
+ yields = true;
+ }
+
+ public void AddAnonymousMethod (AnonymousMethodExpression anonymous)
+ {
+ if (anonymous_methods == null)
+ anonymous_methods = new ArrayList ();
+ anonymous_methods.Add (anonymous);
+ }
+
+ public void Propagate (IAnonymousHost real_host)
+ {
+ if (yields)
+ real_host.SetYields ();
+ if (anonymous_methods != null) {
+ foreach (AnonymousMethodExpression ame in anonymous_methods)
+ real_host.AddAnonymousMethod (ame);
+ }
+ }
}
// <summary>
if (expr is Invocation){
Report.Error (1002, expr.Location, "Expecting `;'");
} else {
- Report.Error (-1, expr.Location, "Invalid Type definition");
+ Report.Error (201, expr.Location, "Only assignment, call, increment, decrement, and new object expressions can be used as a statement");
}
}
-TypeContainer pop_current_class ()
+void push_current_class (TypeContainer tc, bool is_interface, object partial_token)
{
- TypeContainer retval = current_class;
+ if (partial_token != null)
+ current_container = current_container.AddPartial (tc, is_interface);
+ else
+ current_container = current_container.AddTypeContainer (tc, is_interface);
+ current_class = tc;
+}
+
+DeclSpace pop_current_class ()
+{
+ DeclSpace retval = current_class;
current_class = current_class.Parent;
- current_container = current_container.Parent;
-
- if (current_class != current_container) {
- if (!(current_class is ClassPart) ||
- ((ClassPart) current_class).PartialContainer != current_container)
- throw new InternalErrorException ();
- } else if (current_container is ClassPart)
- current_container = ((ClassPart) current_class).PartialContainer;
+ current_container = current_class.PartialContainer;
return retval;
}
{
Namespace ns = current_namespace.NS;
- if (current_container.Name == ""){
- if (ns.Name != "")
+ if (current_container.Name.Length == 0){
+ if (ns.Name.Length != 0)
return new MemberName (ns.MemberName, class_name);
else
return class_name;
foreach (VariableDeclaration decl in inits){
Assign assign;
- Expression expr;
+ Expression expr = decl.expression_or_array_initializer;
- if (decl.expression_or_array_initializer is Expression){
- expr = (Expression) decl.expression_or_array_initializer;
-
- } else {
- ArrayList init = (ArrayList) decl.expression_or_array_initializer;
-
- expr = new ArrayCreation (type, "", init, decl.Location);
- }
-
LocalVariableReference var;
var = new LocalVariableReference (implicit_block, decl.identifier, loc);
public CSharpParser (SeekableStreamReader reader, SourceFile file, ArrayList defines)
{
- current_namespace = new NamespaceEntry (null, file, null, Location.Null);
this.name = file.Name;
this.file = file;
- current_container = RootContext.Tree.Types;
- // TODO: Make RootContext.Tree.Types a PartialContainer.
- current_class = current_container;
- current_container.NamespaceEntry = current_namespace;
- oob_stack = new Stack ();
- switch_stack = new Stack ();
+ current_namespace = new NamespaceEntry (null, file, null);
+ current_class = current_namespace.SlaveDeclSpace;
+ current_container = current_class.PartialContainer; // == RootContest.ToplevelTypes
lexer = new Tokenizer (reader, file, defines);
}
public void parse ()
{
+ int errors = Report.Errors;
try {
if (yacc_verbose_flag > 1)
yyparse (lexer, new yydebug.yyDebugSimple ());
// Removed for production use, use parser verbose to get the output.
//
// Console.WriteLine (e);
- Report.Error (-25, lexer.Location, "Parsing error");
+ if (Report.Errors == errors)
+ Report.Error (-25, lexer.Location, "Parsing error");
if (yacc_verbose_flag > 0)
Console.WriteLine (e);
}
- RootContext.Tree.Types.NamespaceEntry = null;
+ if (RootContext.ToplevelTypes.NamespaceEntry != null)
+ throw new InternalErrorException ("who set it?");
}
-void CheckToken (int error, int yyToken, string msg, Location loc)
+static void CheckToken (int error, int yyToken, string msg, Location loc)
{
- if (yyToken >= Token.FIRST_KEYWORD && yyToken <= Token.LAST_KEYWORD){
- Report.Error (error, loc, String.Format ("{0}: `{1}' is a keyword", msg, yyNames [yyToken].ToLower ()));
- return;
- }
- Report.Error (error, loc, msg);
+ if (yyToken >= Token.FIRST_KEYWORD && yyToken <= Token.LAST_KEYWORD)
+ Report.Error (error, loc, "{0}: `{1}' is a keyword", msg, yyNames [yyToken].ToLower ());
+ else
+ Report.Error (error, loc, msg);
}
void CheckIdentifierToken (int yyToken, Location loc)
projects / mono.git / blobdiff