Changeset 317


Ignore:
Timestamp:
Oct 28, 2014, 8:51:53 AM (6 years ago)
Author:
Maxim Reznik
Message:

Fix tests regressions

Location:
branches/invoke/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/invoke/src/ag/env_out.ag

    r316 r317  
    919919
    920920Synthesized attributes
     921  compilation_unit_body,
    921922  compilation_unit_declaration,
     923  function_body,
    922924  function_declaration,
    923925  function_instantiation,
     
    928930  generic_procedure_declaration,
    929931  generic_procedure_renaming,
     932  library_unit_body,
    930933  library_unit_declaration,
     934  package_body,
    931935  package_declaration,
    932936  package_instantiation,
    933937  package_renaming_declaration,
     938  procedure_body,
    934939  procedure_declaration,
    935940  procedure_instantiation
     
    943948.)
    944949
     950Rules for compilation_unit_body. :
     951(.
     952      ${compilation_unit_body.declarative_region} := ${Unit_Declaration.declarative_region};
     953      Self.Compilation.Context.Environment_Set.Set_Library_Unit_Environment
     954        (${Unit_Declaration.full_name}, ${Unit_Declaration.declarative_region});
     955.)
     956
    945957Rules for generic_package_declaration. :
    946958(.
     
    9991011      ${procedure_instantiation.declarative_region} := 0; --  FIXME
    10001012.)
     1013Rules for package_body. :
     1014(.
     1015      ${package_body.declarative_region} := 0; --  FIXME
     1016.)
     1017Rules for function_body. :
     1018(.
     1019      ${function_body.declarative_region} := 0; --  FIXME
     1020.)
     1021Rules for procedure_body. :
     1022(.
     1023      ${procedure_body.declarative_region} := 0; --  FIXME
     1024.)
  • branches/invoke/src/ag/syntax.ag

    r295 r317  
    1515  identifier                <Accept_Entry_Direct_Name>
    1616  token                     <left_parenthesis_token>
    17   expression                <Accept_Entry_Index>
     17  [expression               <Accept_Entry_Index>]
    1818  token                     <right_parenthesis_token>
    1919  token                     <lp_token>
     
    14911491
    14921492raise_statement ::=
    1493   token      <raise_token>
    1494   name       <Raised_Exception>
    1495   token      <with_token>
    1496   expression <Raise_Statement_Message>
    1497   token      <semicolon_token>
     1493  token       <raise_token>
     1494  name        <Raised_Exception>
     1495  token       <with_token>
     1496  [expression <Raise_Statement_Message>]
     1497  token       <semicolon_token>
    14981498;
    14991499
     
    16111611
    16121612simple_return_statement ::=
    1613   token      <return_token>
    1614   expression <Return_Expression>
    1615   token      <semicolon_token>
     1613  token       <return_token>
     1614  [expression <Return_Expression>]
     1615  token       <semicolon_token>
    16161616;
    16171617
  • branches/invoke/src/semantic/gela-plain_environments.adb

    r316 r317  
    150150         Local  : Gela.Name_List_Managers.List;
    151151         Target : Region_Item_Count;
    152          Name   : Defining_Name_Item_Count;
    153152      begin
    154153         Self.Current.Next;
     
    159158            while Target = 0 loop
    160159               --  Next name in use clauses of Region
    161                Name := Self.Set.Use_Package.Tail (Self.Use_Name);
    162 
    163                while Name = 0 loop
     160               Self.Use_Name := Self.Set.Use_Package.Tail (Self.Use_Name);
     161
     162               while Self.Use_Name = 0 loop
    164163                  Self.Region := Self.Set.Region.Tail (Self.Region);
    165164
     
    168167                  end if;
    169168
    170                   Name := Self.Set.Region.Head (Self.Region).Use_Package;
     169                  Self.Use_Name :=
     170                    Self.Set.Region.Head (Self.Region).Use_Package;
    171171               end loop;
    172172
    173173               Target := Self.Name_To_Region
    174                  (Self.Set.Use_Package.Head (Name));
     174                 (Self.Set.Use_Package.Head (Self.Use_Name));
    175175            end loop;
    176176
     
    401401
    402402   begin
     403      if Target in 0 | Self.Library_Level_Environment then
     404         --  Fix constraint_error because library_bodies doesn have env yet
     405         return Index;
     406      end if;
     407
    403408      Target := Self.Leave_Declarative_Region (Target);
    404409      Target_Env := Self.Env.Element (Target);
Note: See TracChangeset for help on using the changeset viewer.