aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorTristan Gingold <tgingold@free.fr>2019-07-08 18:24:10 +0200
committerTristan Gingold <tgingold@free.fr>2019-07-08 18:27:03 +0200
commitc904411e863ec9b9d82744cf1ee6d4b1d0dde9d3 (patch)
tree2fe8936f1a20fa953d71d0408d11b41a2c3b4ef5 /python
parent2c486001009324c9f87adcb8ac6b317a839a7738 (diff)
downloadghdl-c904411e863ec9b9d82744cf1ee6d4b1d0dde9d3.tar.gz
ghdl-c904411e863ec9b9d82744cf1ee6d4b1d0dde9d3.tar.bz2
ghdl-c904411e863ec9b9d82744cf1ee6d4b1d0dde9d3.zip
Fix a merge collision.
Diffstat (limited to 'python')
-rw-r--r--python/libghdl/thin/vhdl/nodes.py238
1 files changed, 84 insertions, 154 deletions
diff --git a/python/libghdl/thin/vhdl/nodes.py b/python/libghdl/thin/vhdl/nodes.py
index 101e6500b..5f93cebef 100644
--- a/python/libghdl/thin/vhdl/nodes.py
+++ b/python/libghdl/thin/vhdl/nodes.py
@@ -132,7 +132,6 @@ class Iir_Kind:
Interface_Package_Declaration = 117
Interface_Function_Declaration = 118
Interface_Procedure_Declaration = 119
-<<<<<<< HEAD
Anonymous_Signal_Declaration = 120
Signal_Attribute_Declaration = 121
Identity_Operator = 122
@@ -200,159 +199,90 @@ class Iir_Kind:
Concurrent_Assertion_Statement = 184
Concurrent_Procedure_Call_Statement = 185
Psl_Assert_Statement = 186
- Psl_Cover_Statement = 187
-=======
- Signal_Attribute_Declaration = 120
- Identity_Operator = 121
- Negation_Operator = 122
- Absolute_Operator = 123
- Not_Operator = 124
- Implicit_Condition_Operator = 125
- Condition_Operator = 126
- Reduction_And_Operator = 127
- Reduction_Or_Operator = 128
- Reduction_Nand_Operator = 129
- Reduction_Nor_Operator = 130
- Reduction_Xor_Operator = 131
- Reduction_Xnor_Operator = 132
- And_Operator = 133
- Or_Operator = 134
- Nand_Operator = 135
- Nor_Operator = 136
- Xor_Operator = 137
- Xnor_Operator = 138
- Equality_Operator = 139
- Inequality_Operator = 140
- Less_Than_Operator = 141
- Less_Than_Or_Equal_Operator = 142
- Greater_Than_Operator = 143
- Greater_Than_Or_Equal_Operator = 144
- Match_Equality_Operator = 145
- Match_Inequality_Operator = 146
- Match_Less_Than_Operator = 147
- Match_Less_Than_Or_Equal_Operator = 148
- Match_Greater_Than_Operator = 149
- Match_Greater_Than_Or_Equal_Operator = 150
- Sll_Operator = 151
- Sla_Operator = 152
- Srl_Operator = 153
- Sra_Operator = 154
- Rol_Operator = 155
- Ror_Operator = 156
- Addition_Operator = 157
- Substraction_Operator = 158
- Concatenation_Operator = 159
- Multiplication_Operator = 160
- Division_Operator = 161
- Modulus_Operator = 162
- Remainder_Operator = 163
- Exponentiation_Operator = 164
- Function_Call = 165
- Aggregate = 166
- Parenthesis_Expression = 167
- Qualified_Expression = 168
- Type_Conversion = 169
- Allocator_By_Expression = 170
- Allocator_By_Subtype = 171
- Selected_Element = 172
- Dereference = 173
- Implicit_Dereference = 174
- Slice_Name = 175
- Indexed_Name = 176
- Psl_Expression = 177
- Sensitized_Process_Statement = 178
- Process_Statement = 179
- Concurrent_Simple_Signal_Assignment = 180
- Concurrent_Conditional_Signal_Assignment = 181
- Concurrent_Selected_Signal_Assignment = 182
- Concurrent_Assertion_Statement = 183
- Concurrent_Procedure_Call_Statement = 184
- Psl_Assert_Statement = 185
- Psl_Cover_Directive = 186
- Psl_Restrict_Directive = 187
->>>>>>> vhdl: parse and analyze restrict directive.
- Block_Statement = 188
- If_Generate_Statement = 189
- Case_Generate_Statement = 190
- For_Generate_Statement = 191
- Component_Instantiation_Statement = 192
- Psl_Default_Clock = 193
- Simple_Simultaneous_Statement = 194
- Generate_Statement_Body = 195
- If_Generate_Else_Clause = 196
- Simple_Signal_Assignment_Statement = 197
- Conditional_Signal_Assignment_Statement = 198
- Selected_Waveform_Assignment_Statement = 199
- Null_Statement = 200
- Assertion_Statement = 201
- Report_Statement = 202
- Wait_Statement = 203
- Variable_Assignment_Statement = 204
- Conditional_Variable_Assignment_Statement = 205
- Return_Statement = 206
- For_Loop_Statement = 207
- While_Loop_Statement = 208
- Next_Statement = 209
- Exit_Statement = 210
- Case_Statement = 211
- Procedure_Call_Statement = 212
- If_Statement = 213
- Elsif = 214
- Character_Literal = 215
- Simple_Name = 216
- Selected_Name = 217
- Operator_Symbol = 218
- Reference_Name = 219
- External_Constant_Name = 220
- External_Signal_Name = 221
- External_Variable_Name = 222
- Selected_By_All_Name = 223
- Parenthesis_Name = 224
- Package_Pathname = 225
- Absolute_Pathname = 226
- Relative_Pathname = 227
- Pathname_Element = 228
- Base_Attribute = 229
- Subtype_Attribute = 230
- Element_Attribute = 231
- Left_Type_Attribute = 232
- Right_Type_Attribute = 233
- High_Type_Attribute = 234
- Low_Type_Attribute = 235
- Ascending_Type_Attribute = 236
- Image_Attribute = 237
- Value_Attribute = 238
- Pos_Attribute = 239
- Val_Attribute = 240
- Succ_Attribute = 241
- Pred_Attribute = 242
- Leftof_Attribute = 243
- Rightof_Attribute = 244
- Delayed_Attribute = 245
- Stable_Attribute = 246
- Quiet_Attribute = 247
- Transaction_Attribute = 248
- Event_Attribute = 249
- Active_Attribute = 250
- Last_Event_Attribute = 251
- Last_Active_Attribute = 252
- Last_Value_Attribute = 253
- Driving_Attribute = 254
- Driving_Value_Attribute = 255
- Behavior_Attribute = 256
- Structure_Attribute = 257
- Simple_Name_Attribute = 258
- Instance_Name_Attribute = 259
- Path_Name_Attribute = 260
- Left_Array_Attribute = 261
- Right_Array_Attribute = 262
- High_Array_Attribute = 263
- Low_Array_Attribute = 264
- Length_Array_Attribute = 265
- Ascending_Array_Attribute = 266
- Range_Array_Attribute = 267
- Reverse_Range_Array_Attribute = 268
- Attribute_Name = 269
+ Psl_Cover_Directive = 187
+ Psl_Restrict_Directive = 188
+ Block_Statement = 189
+ If_Generate_Statement = 190
+ Case_Generate_Statement = 191
+ For_Generate_Statement = 192
+ Component_Instantiation_Statement = 193
+ Psl_Default_Clock = 194
+ Simple_Simultaneous_Statement = 195
+ Generate_Statement_Body = 196
+ If_Generate_Else_Clause = 197
+ Simple_Signal_Assignment_Statement = 198
+ Conditional_Signal_Assignment_Statement = 199
+ Selected_Waveform_Assignment_Statement = 200
+ Null_Statement = 201
+ Assertion_Statement = 202
+ Report_Statement = 203
+ Wait_Statement = 204
+ Variable_Assignment_Statement = 205
+ Conditional_Variable_Assignment_Statement = 206
+ Return_Statement = 207
+ For_Loop_Statement = 208
+ While_Loop_Statement = 209
+ Next_Statement = 210
+ Exit_Statement = 211
+ Case_Statement = 212
+ Procedure_Call_Statement = 213
+ If_Statement = 214
+ Elsif = 215
+ Character_Literal = 216
+ Simple_Name = 217
+ Selected_Name = 218
+ Operator_Symbol = 219
+ Reference_Name = 220
+ External_Constant_Name = 221
+ External_Signal_Name = 222
+ External_Variable_Name = 223
+ Selected_By_All_Name = 224
+ Parenthesis_Name = 225
+ Package_Pathname = 226
+ Absolute_Pathname = 227
+ Relative_Pathname = 228
+ Pathname_Element = 229
+ Base_Attribute = 230
+ Subtype_Attribute = 231
+ Element_Attribute = 232
+ Left_Type_Attribute = 233
+ Right_Type_Attribute = 234
+ High_Type_Attribute = 235
+ Low_Type_Attribute = 236
+ Ascending_Type_Attribute = 237
+ Image_Attribute = 238
+ Value_Attribute = 239
+ Pos_Attribute = 240
+ Val_Attribute = 241
+ Succ_Attribute = 242
+ Pred_Attribute = 243
+ Leftof_Attribute = 244
+ Rightof_Attribute = 245
+ Delayed_Attribute = 246
+ Stable_Attribute = 247
+ Quiet_Attribute = 248
+ Transaction_Attribute = 249
+ Event_Attribute = 250
+ Active_Attribute = 251
+ Last_Event_Attribute = 252
+ Last_Active_Attribute = 253
+ Last_Value_Attribute = 254
+ Driving_Attribute = 255
+ Driving_Value_Attribute = 256
+ Behavior_Attribute = 257
+ Structure_Attribute = 258
+ Simple_Name_Attribute = 259
+ Instance_Name_Attribute = 260
+ Path_Name_Attribute = 261
+ Left_Array_Attribute = 262
+ Right_Array_Attribute = 263
+ High_Array_Attribute = 264
+ Low_Array_Attribute = 265
+ Length_Array_Attribute = 266
+ Ascending_Array_Attribute = 267
+ Range_Array_Attribute = 268
+ Reverse_Range_Array_Attribute = 269
+ Attribute_Name = 270
class Iir_Kinds: