Exclude typeclasses from master, because of new workflow.
This commit is contained in:
Voloshin Bogdan
parent
da8b1e671c
commit
12ee45f0fc
|
|
@ -1,9 +1,9 @@
|
|||
//
|
||||
// This CSharp output file generated by Gardens Point LEX
|
||||
// Version: 1.1.3.301
|
||||
// Machine: DESKTOP-A6LT9RI
|
||||
// DateTime: 20.07.2018 12:14:31
|
||||
// UserName: ?????????
|
||||
// Machine: DESKTOP-7B4K9VB
|
||||
// DateTime: 23.07.2018 1:42:02
|
||||
// UserName: Bogdan
|
||||
// GPLEX input file <ABCPascal.lex>
|
||||
// GPLEX frame file <embedded resource>
|
||||
//
|
||||
|
|
@ -1951,9 +1951,9 @@ string cur_yytext = yytext;
|
|||
case (int)Tokens.tkLibrary:
|
||||
case (int)Tokens.tkExternal:
|
||||
case (int)Tokens.tkYield:
|
||||
case (int)Tokens.tkSequence:
|
||||
case (int)Tokens.tkSequence:/*
|
||||
case (int)Tokens.tkTypeclass:
|
||||
case (int)Tokens.tkInstance:
|
||||
case (int)Tokens.tkInstance:*/
|
||||
case (int)Tokens.tkMatch:
|
||||
case (int)Tokens.tkWhen:
|
||||
yylval = new Union();
|
||||
|
|
|
|||
|
|
@ -359,9 +359,9 @@ UNICODEARROW \x890
|
|||
case (int)Tokens.tkLibrary:
|
||||
case (int)Tokens.tkExternal:
|
||||
case (int)Tokens.tkYield:
|
||||
case (int)Tokens.tkSequence:
|
||||
case (int)Tokens.tkSequence:/*
|
||||
case (int)Tokens.tkTypeclass:
|
||||
case (int)Tokens.tkInstance:
|
||||
case (int)Tokens.tkInstance:*/
|
||||
case (int)Tokens.tkMatch:
|
||||
case (int)Tokens.tkWhen:
|
||||
yylval = new Union();
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
%token <ti> tkDirectiveName tkAmpersend tkColon tkDotDot tkPoint tkRoundOpen tkRoundClose tkSemiColon tkSquareOpen tkSquareClose tkQuestion tkQuestionPoint tkDoubleQuestion tkQuestionSquareOpen
|
||||
%token <ti> tkSizeOf tkTypeOf tkWhere tkArray tkCase tkClass tkAuto tkConst tkConstructor tkDestructor tkElse tkExcept tkFile tkFor tkForeach tkFunction tkMatch tkWhen
|
||||
%token <ti> tkIf tkImplementation tkInherited tkInterface tkTypeclass tkInstance tkProcedure tkOperator tkProperty tkRaise tkRecord tkSet tkType tkThen tkUses tkVar tkWhile tkWith tkNil
|
||||
%token <ti> tkIf tkImplementation tkInherited tkInterface /* tkTypeclass tkInstance */ tkProcedure tkOperator tkProperty tkRaise tkRecord tkSet tkType tkThen tkUses tkVar tkWhile tkWith tkNil
|
||||
%token <ti> tkGoto tkOf tkLabel tkLock tkProgram tkEvent tkDefault tkTemplate tkPacked tkExports tkResourceString tkThreadvar tkSealed tkPartial tkTo tkDownto
|
||||
%token <ti> tkLoop
|
||||
%token <ti> tkSequence tkYield
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
%type <id> func_name_ident param_name const_field_name func_name_with_template_args identifier_or_keyword unit_name exception_variable const_name func_meth_name_ident label_name type_decl_identifier template_identifier_with_equal
|
||||
%type <id> program_param identifier identifier_keyword_operatorname func_class_name_ident /*optional_identifier*/ visibility_specifier
|
||||
%type <id> property_specifier_directives non_reserved
|
||||
%type <id> typeclass_restriction
|
||||
//%type <id> typeclass_restriction
|
||||
%type <stn> if_stmt
|
||||
%type <stn> initialization_part
|
||||
%type <stn> template_arguments label_list ident_or_keyword_pointseparator_list ident_list param_name_list
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
%type <ex> typeof_expr
|
||||
%type <stn> simple_fp_sect
|
||||
%type <stn> template_param_list template_type_params
|
||||
%type <stn> template_type_or_typeclass_params typeclass_params
|
||||
//%type <stn> template_type_or_typeclass_params typeclass_params
|
||||
%type <td> template_type
|
||||
%type <stn> try_stmt
|
||||
%type <stn> uses_clause used_units_list
|
||||
|
|
@ -906,7 +906,7 @@ const_variable
|
|||
{
|
||||
$$ = NewConstVariable($1, $2, @$);
|
||||
}
|
||||
| const_variable tkAmpersend template_type_or_typeclass_params
|
||||
| const_variable tkAmpersend template_type_params
|
||||
{
|
||||
$$ = new ident_with_templateparams($1 as addressed_value, $3 as template_param_list, @$);
|
||||
}
|
||||
|
|
@ -1119,7 +1119,7 @@ simple_type_decl
|
|||
| template_identifier_with_equal type_decl_type tkSemiColon
|
||||
{
|
||||
$$ = new type_declaration($1, $2, @$);
|
||||
}
|
||||
}/*
|
||||
| typeclass_restriction tkEqual tkTypeclass optional_base_classes optional_component_list_seq_end tkSemiColon
|
||||
{
|
||||
$$ = new type_declaration($1 as typeclass_restriction, new typeclass_definition($4 as named_type_reference_list, $5 as class_body_list, @$), @$);
|
||||
|
|
@ -1127,9 +1127,9 @@ simple_type_decl
|
|||
| typeclass_restriction tkEqual tkInstance optional_component_list_seq_end tkSemiColon
|
||||
{
|
||||
$$ = new type_declaration($1 as typeclass_restriction, new instance_definition($4 as class_body_list, @$), @$);
|
||||
}
|
||||
}*/
|
||||
;
|
||||
|
||||
/*
|
||||
typeclass_restriction
|
||||
: simple_type_identifier typeclass_params
|
||||
{
|
||||
|
|
@ -1153,7 +1153,8 @@ template_type_or_typeclass_params
|
|||
{
|
||||
$$ = $1;
|
||||
}
|
||||
;
|
||||
;*/
|
||||
|
||||
type_decl_identifier
|
||||
: identifier
|
||||
{ $$ = $1; }
|
||||
|
|
@ -1687,12 +1688,12 @@ base_class_name
|
|||
: simple_type_identifier
|
||||
{ $$ = $1; }
|
||||
| template_type
|
||||
{ $$ = $1; }
|
||||
{ $$ = $1; }/*
|
||||
| typeclass_restriction
|
||||
{
|
||||
var names = new List<ident>();
|
||||
names.Add(($1 as typeclass_restriction).name);
|
||||
$$ = new typeclass_reference(null, names, ($1 as typeclass_restriction).restriction_args); }
|
||||
$$ = new typeclass_reference(null, names, ($1 as typeclass_restriction).restriction_args); }*/
|
||||
;
|
||||
|
||||
template_arguments
|
||||
|
|
@ -1725,11 +1726,11 @@ where_part
|
|||
: tkWhere ident_list tkColon type_ref_and_secific_list tkSemiColon
|
||||
{
|
||||
$$ = new where_definition($2 as ident_list, $4 as where_type_specificator_list, @$);
|
||||
}
|
||||
}/*
|
||||
| tkWhere typeclass_restriction tkSemiColon
|
||||
{
|
||||
$$ = new where_typeclass_constraint($2 as typeclass_restriction);
|
||||
}
|
||||
}*/
|
||||
;
|
||||
|
||||
type_ref_and_secific_list
|
||||
|
|
@ -3142,7 +3143,7 @@ simple_or_template_type_reference
|
|||
{
|
||||
$$ = new template_type_reference((named_type_reference)$1, (template_param_list)$2, @$);
|
||||
}
|
||||
| simple_type_identifier tkAmpersend template_type_or_typeclass_params
|
||||
| simple_type_identifier tkAmpersend template_type_params
|
||||
{
|
||||
$$ = new template_type_reference((named_type_reference)$1, (template_param_list)$3, @$);
|
||||
}
|
||||
|
|
@ -3707,7 +3708,7 @@ variable
|
|||
{
|
||||
$$ = new roof_dereference($1 as addressed_value,@$);
|
||||
}
|
||||
| variable tkAmpersend template_type_or_typeclass_params
|
||||
| variable tkAmpersend template_type_params
|
||||
{
|
||||
$$ = new ident_with_templateparams($1 as addressed_value, $3 as template_param_list, @$);
|
||||
}
|
||||
|
|
@ -4044,9 +4045,9 @@ keyword
|
|||
| tkMatch
|
||||
{ $$ = $1; }
|
||||
| tkWhen
|
||||
{ $$ = $1; }
|
||||
{ $$ = $1; }/*
|
||||
| tkInstance
|
||||
{ $$ = $1; }
|
||||
{ $$ = $1; }*/
|
||||
;
|
||||
|
||||
reserved_keyword
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -143,9 +143,9 @@ namespace GPPGParserScanner
|
|||
keywords.Add(Convert("yield"), (int)Tokens.tkYield);
|
||||
keywords.Add(Convert("match"), (int)Tokens.tkMatch);
|
||||
keywords.Add(Convert("when"), (int)Tokens.tkWhen);
|
||||
keywords.Add(Convert("namespace"), (int)Tokens.tkNamespace);
|
||||
keywords.Add(Convert("namespace"), (int)Tokens.tkNamespace);/*
|
||||
keywords.Add(Convert("typeclass"), (int)Tokens.tkTypeclass);
|
||||
keywords.Add(Convert("instance"), (int)Tokens.tkInstance);
|
||||
keywords.Add(Convert("instance"), (int)Tokens.tkInstance);*/
|
||||
}
|
||||
|
||||
static Keywords()
|
||||
|
|
|
|||
|
|
@ -2073,7 +2073,7 @@ type
|
|||
class _instance: T;
|
||||
class inited: boolean := false;
|
||||
public
|
||||
class function &Instance: T;
|
||||
class function Instance: T;
|
||||
begin
|
||||
if inited = false then
|
||||
begin
|
||||
|
|
@ -3207,7 +3207,7 @@ begin
|
|||
while t <> typeof(Object) do
|
||||
begin
|
||||
meth := t.GetMethod('ToString', System.Reflection.BindingFlags.Public or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.DeclaredOnly, nil, new System.Type[0], nil);
|
||||
if meth <> nil then
|
||||
break;
|
||||
|
|
@ -3291,8 +3291,8 @@ begin
|
|||
else
|
||||
while t <> typeof(object) do
|
||||
begin
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
|
||||
for var i := ff.Length - 1 downto 0 do
|
||||
sb.Insert(1, StructuredObjectToString(ff[i].GetValue(o), n + 1) + ',');
|
||||
|
|
@ -10955,7 +10955,7 @@ begin
|
|||
begin
|
||||
variable.GetType.InvokeMember('$Init$',
|
||||
System.Reflection.BindingFlags.InvokeMethod or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.Public, nil, variable, nil);
|
||||
result := variable;
|
||||
end;
|
||||
|
|
|
|||
|
|
@ -2063,7 +2063,7 @@ type
|
|||
class _instance: T;
|
||||
class inited: boolean := false;
|
||||
public
|
||||
class function &Instance: T;
|
||||
class function Instance: T;
|
||||
begin
|
||||
if inited = false then
|
||||
begin
|
||||
|
|
@ -3196,7 +3196,7 @@ begin
|
|||
while t <> typeof(Object) do
|
||||
begin
|
||||
meth := t.GetMethod('ToString', System.Reflection.BindingFlags.Public or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.DeclaredOnly, nil, new System.Type[0], nil);
|
||||
if meth <> nil then
|
||||
break;
|
||||
|
|
@ -3280,8 +3280,8 @@ begin
|
|||
else
|
||||
while t <> typeof(object) do
|
||||
begin
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
|
||||
for var i := ff.Length - 1 downto 0 do
|
||||
sb.Insert(1, StructuredObjectToString(ff[i].GetValue(o), n + 1) + ',');
|
||||
|
|
@ -10899,7 +10899,7 @@ begin
|
|||
begin
|
||||
variable.GetType.InvokeMember('$Init$',
|
||||
System.Reflection.BindingFlags.InvokeMethod or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.Public, nil, variable, nil);
|
||||
result := variable;
|
||||
end;
|
||||
|
|
|
|||
|
|
@ -2063,7 +2063,7 @@ type
|
|||
class _instance: T;
|
||||
class inited: boolean := false;
|
||||
public
|
||||
class function &Instance: T;
|
||||
class function Instance: T;
|
||||
begin
|
||||
if inited = false then
|
||||
begin
|
||||
|
|
@ -3196,7 +3196,7 @@ begin
|
|||
while t <> typeof(Object) do
|
||||
begin
|
||||
meth := t.GetMethod('ToString', System.Reflection.BindingFlags.Public or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.DeclaredOnly, nil, new System.Type[0], nil);
|
||||
if meth <> nil then
|
||||
break;
|
||||
|
|
@ -3280,8 +3280,8 @@ begin
|
|||
else
|
||||
while t <> typeof(object) do
|
||||
begin
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
|
||||
for var i := ff.Length - 1 downto 0 do
|
||||
sb.Insert(1, StructuredObjectToString(ff[i].GetValue(o), n + 1) + ',');
|
||||
|
|
@ -10899,7 +10899,7 @@ begin
|
|||
begin
|
||||
variable.GetType.InvokeMember('$Init$',
|
||||
System.Reflection.BindingFlags.InvokeMethod or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.Public, nil, variable, nil);
|
||||
result := variable;
|
||||
end;
|
||||
|
|
|
|||
|
|
@ -2073,7 +2073,7 @@ type
|
|||
class _instance: T;
|
||||
class inited: boolean := false;
|
||||
public
|
||||
class function &Instance: T;
|
||||
class function Instance: T;
|
||||
begin
|
||||
if inited = false then
|
||||
begin
|
||||
|
|
@ -3207,7 +3207,7 @@ begin
|
|||
while t <> typeof(Object) do
|
||||
begin
|
||||
meth := t.GetMethod('ToString', System.Reflection.BindingFlags.Public or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.DeclaredOnly, nil, new System.Type[0], nil);
|
||||
if meth <> nil then
|
||||
break;
|
||||
|
|
@ -3291,8 +3291,8 @@ begin
|
|||
else
|
||||
while t <> typeof(object) do
|
||||
begin
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.&Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var ff := t.GetFields(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
var pp := t.GetProperties(System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.DeclaredOnly);
|
||||
|
||||
for var i := ff.Length - 1 downto 0 do
|
||||
sb.Insert(1, StructuredObjectToString(ff[i].GetValue(o), n + 1) + ',');
|
||||
|
|
@ -10955,7 +10955,7 @@ begin
|
|||
begin
|
||||
variable.GetType.InvokeMember('$Init$',
|
||||
System.Reflection.BindingFlags.InvokeMethod or
|
||||
System.Reflection.BindingFlags.&Instance or
|
||||
System.Reflection.BindingFlags.Instance or
|
||||
System.Reflection.BindingFlags.Public, nil, variable, nil);
|
||||
result := variable;
|
||||
end;
|
||||
|
|
|
|||
Loading…
Reference in a new issue