diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-01-06 11:30:54 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2015-01-06 11:30:54 +0100 |
| commit | 3dfe4883e7b0dec116a927968f8fe60500f03c35 (patch) | |
| tree | c895f7df1a184cfc7034b830555d10913c43d454 /gcc/ada/prj-proc.adb | |
| parent | 59e9bc0b6ff7d00bd56a5b4767014b6529bf820b (diff) | |
| download | gcc-3dfe4883e7b0dec116a927968f8fe60500f03c35.zip gcc-3dfe4883e7b0dec116a927968f8fe60500f03c35.tar.gz gcc-3dfe4883e7b0dec116a927968f8fe60500f03c35.tar.bz2 | |
[multiple changes]
2015-01-06 Pascal Obry <obry@adacore.com>
* bindgen.adb: Minor style fix.
2015-01-06 Robert Dewar <dewar@adacore.com>
* sem_util.ads, sem_util.adb: Minor reformatting.
2015-01-06 Vincent Celier <celier@adacore.com>
* prj-conf.adb (Parse_Project_And_Apply_Config): Reset incomplete
with flags before parsing the projects.
* prj-err.adb (Error_Msg): Do nothing if there are incomplete withs.
* prj-part.adb (Post_Parse_Context_Clause): Set Incomplete_Withs
to True in the flags, when Ignore_Missing_With is True and an
imported project cannot be found.
* prj-proc.adb (Expression): When there are incomplete withs and
a variable or attribute is not found, set the variable/attribute
to unknown.
* prj.ads (Processing_Flags): New flag Incomplete_Withs,
defaulted to False.
2015-01-06 Vasiliy Fofanov <fofanov@adacore.com>
* prj-proc.adb, prj-part.adb, prj.adb, prj.ads, prj-conf.adb,
prj-err.adb: Add new switch --no-command-line.
From-SVN: r219252
Diffstat (limited to 'gcc/ada/prj-proc.adb')
| -rw-r--r-- | gcc/ada/prj-proc.adb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb index 71ac421..ac2cc66 100644 --- a/gcc/ada/prj-proc.adb +++ b/gcc/ada/prj-proc.adb @@ -819,11 +819,23 @@ package body Prj.Proc is end if; - pragma Assert (The_Variable_Id /= No_Variable, - "variable or attribute not found"); + if From_Project_Node_Tree.Incomplete_With then + if The_Variable_Id = No_Variable then + The_Variable := Nil_Variable_Value; + else + The_Variable := + Shared.Variable_Elements.Table + (The_Variable_Id).Value; + end if; - The_Variable := - Shared.Variable_Elements.Table (The_Variable_Id).Value; + else + pragma Assert (The_Variable_Id /= No_Variable, + "variable or attribute not found"); + + The_Variable := + Shared.Variable_Elements.Table + (The_Variable_Id).Value; + end if; else |