[gobo-eiffel-commits] CVS: gobo/library/tools/eiffel/compilation et_expression_checker.e,1.12,1.13

[Eric B. <er...@us...>]

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/compilation
In directory sc8-pr-cvs1:/tmp/cvs-serv18924/library/tools/eiffel/compilation

Modified Files:
	et_expression_checker.e 
Log Message:
$feature_name is of type POINTER, even  in ISE and its
TYPED_POINTER support.


Index: et_expression_checker.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/compilation/et_expression_checker.e,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** et_expression_checker.e	18 Dec 2003 09:36:12 -0000	1.12
--- et_expression_checker.e	18 Dec 2003 11:23:28 -0000	1.13
***************
*** 1354,1365 ****
  					else
  						a_feature := a_class_impl.named_feature (a_name)
! 						if a_feature = Void then
! 							set_fatal_error
! 								-- ISE Eiffel 5.4 reports this error as a VEEN,
! 								-- but it is in fact a VUAR-4 (ETL2 p.369).
! 							error_handler.report_vuar4a_error (a_class_impl, a_name)
! 						elseif a_feature.type = Void then
! -- TODO.
! 						else
  							a_seed := a_feature.first_seed
  							a_name.set_seed (a_seed)
--- 1354,1358 ----
  					else
  						a_feature := a_class_impl.named_feature (a_name)
! 						if a_feature /= Void then
  							a_seed := a_feature.first_seed
  							a_name.set_seed (a_seed)
***************
*** 1369,1387 ****
  								already_checked := True
  								if not has_fatal_error then
! 									a_typed_pointer_class := universe.typed_pointer_class
! 									if a_typed_pointer_class.is_preparsed then
! 											-- Class TYPED_POINTER has been found in the universe.
! 											-- Use ISE's implementation.
! 										create an_actuals.make_with_capacity (1)
! 										an_actuals.put_first (a_feature.type)
! 										create a_typed_pointer_type.make (Void, a_typed_pointer_class.name, an_actuals, a_typed_pointer_class)
! 										type := a_typed_pointer_type
! 										context := current_class
! 									else
! 										type := universe.pointer_class
! 										context := current_class
! 									end
  								end
  							end
  						end
  					end
--- 1362,1376 ----
  								already_checked := True
  								if not has_fatal_error then
! 										-- $feature_name is of type POINTER, even
! 										-- in ISE and its TYPED_POINTER support.
! 									type := universe.pointer_class
! 									context := current_class
  								end
  							end
+ 						else
+ 							set_fatal_error
+ 								-- ISE Eiffel 5.4 reports this error as a VEEN,
+ 								-- but it is in fact a VUAR-4 (ETL2 p.369).
+ 							error_handler.report_vuar4a_error (a_class_impl, a_name)
  						end
  					end
***************
*** 1445,1469 ****
  					else
  						a_feature := current_class.seeded_feature (a_seed)
! 						if a_feature = Void then
  								-- Report internal error: if we got a seed, the
  								-- `a_feature' should not be void.
  							set_fatal_error
  							error_handler.report_giaau_error
- 						elseif a_feature.type = Void then
- -- TODO.
- 						else
- 							a_typed_pointer_class := universe.typed_pointer_class
- 							if a_typed_pointer_class.is_preparsed then
- 									-- Class TYPED_POINTER has been found in the universe.
- 									-- Use ISE's implementation.
- 								create an_actuals.make_with_capacity (1)
- 								an_actuals.put_first (a_feature.type)
- 								create a_typed_pointer_type.make (Void, a_typed_pointer_class.name, an_actuals, a_typed_pointer_class)
- 								type := a_typed_pointer_type
- 								context := current_class
- 							else
- 								type := universe.pointer_class
- 								context := current_class
- 							end
  						end
  					end
--- 1434,1447 ----
  					else
  						a_feature := current_class.seeded_feature (a_seed)
! 						if a_feature /= Void then
! 								-- $feature_name is of type POINTER, even
! 								-- in ISE and its TYPED_POINTER support.
! 							type := universe.pointer_class
! 							context := current_class
! 						else
  								-- Report internal error: if we got a seed, the
  								-- `a_feature' should not be void.
  							set_fatal_error
  							error_handler.report_giaau_error
  						end
  					end