Gobo Eiffel Project

Update of /cvsroot/gobo-eiffel/gobo/src/geant/command
In directory usw-pr-cvs1:/tmp/cvs-serv25846

Modified Files:
	geant_copy_command.e geant_delete_command.e 
Log Message:
using feature `nxor' instead of complex boolean combinations


Index: geant_copy_command.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/src/geant/command/geant_copy_command.e,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** geant_copy_command.e	24 Jul 2002 14:51:21 -0000	1.16
--- geant_copy_command.e	28 Sep 2002 08:46:24 -0000	1.17
***************
*** 17,20 ****
--- 17,23 ----
  	GEANT_FILESYSTEM_COMMAND
  
+ 	KL_IMPORTED_BOOLEAN_ROUTINES
+ 		export {NONE} all end
+ 
  creation
  
***************
*** 61,73 ****
  			-- Can command be executed?
  		do
! 			Result :=
! 				(is_file_to_file_executable and not is_file_to_directory_executable and not is_fileset_to_directory_executable) or
! 				(not is_file_to_file_executable and is_file_to_directory_executable and not is_fileset_to_directory_executable) or
! 				(not is_file_to_file_executable and not is_file_to_directory_executable and is_fileset_to_directory_executable)
  		ensure then
! 			file_xor_directory_xor_fileset: Result implies
! 				((is_file_to_file_executable and not is_file_to_directory_executable and not is_fileset_to_directory_executable) or
! 				(not is_file_to_file_executable and is_file_to_directory_executable and not is_fileset_to_directory_executable) or
! 				(not is_file_to_file_executable and not is_file_to_directory_executable and is_fileset_to_directory_executable))
  		end
  
--- 64,72 ----
  			-- Can command be executed?
  		do
! 			Result := BOOLEAN_.nxor (<<is_file_to_file_executable,
! 				is_file_to_directory_executable, is_fileset_to_directory_executable>>)
  		ensure then
! 			exclusive: Result implies BOOLEAN_.nxor (<<is_file_to_file_executable,
! 				is_file_to_directory_executable, is_fileset_to_directory_executable>>)
  		end
  

Index: geant_delete_command.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/src/geant/command/geant_delete_command.e,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** geant_delete_command.e	24 Jul 2002 14:51:21 -0000	1.15
--- geant_delete_command.e	28 Sep 2002 08:46:24 -0000	1.16
***************
*** 17,20 ****
--- 17,23 ----
  	GEANT_COMMAND
  
+ 	KL_IMPORTED_BOOLEAN_ROUTINES
+ 		export {NONE} all end
+ 
  creation
  
***************
*** 52,64 ****
  			-- Can command be executed?
  		do
! 			Result :=
! 				(is_file_executable and not is_directory_executable and not is_fileset_executable) or
! 				(not is_file_executable and is_directory_executable and not is_fileset_executable) or
! 				(not is_file_executable and not is_directory_executable and is_fileset_executable)
  		ensure then
! 			file_xor_directory: Result implies (
! 				(is_file_executable and not is_directory_executable and not is_fileset_executable) or
! 				(not is_file_executable and is_directory_executable and not is_fileset_executable) or
! 				(not is_file_executable and not is_directory_executable and is_fileset_executable))
  		end
  
--- 55,63 ----
  			-- Can command be executed?
  		do
! 			Result := BOOLEAN_.nxor (<<is_file_executable,
! 				is_directory_executable, is_fileset_executable>>)
  		ensure then
! 			exclusive: Result implies BOOLEAN_.nxor (<<is_file_executable,
! 				is_directory_executable, is_fileset_executable>>)
  		end

Update of /cvsroot/gobo-eiffel/gobo/library/xml/event
In directory usw-pr-cvs1:/tmp/cvs-serv26334/event

Modified Files:
	xm_namespace_resolver.e 
Log Message:
Resolving xmlns:test didn't work due to typo and probably the fact
that there is no test case for this code.


Index: xm_namespace_resolver.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/xml/event/xm_namespace_resolver.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** xm_namespace_resolver.e	16 Aug 2002 14:40:30 -0000	1.4
--- xm_namespace_resolver.e	27 Sep 2002 07:28:16 -0000	1.5
***************
*** 17,20 ****
--- 17,21 ----
  	XM_CALLBACKS_FILTER
  		redefine
+ 			on_finish,
  			on_start,
  			on_start_tag,
***************
*** 30,35 ****
--- 31,47 ----
  		export {NONE} all end
  
+ creation
+ 
+ 	make_null,
+ 	set_next
+ 
  feature -- Document
  
+ 	on_finish is
+ 			-- Forward to `next'.
+ 		do
+ 			next.on_finish
+ 		end
+ 
  	on_start is
  			-- Initialize document variables.
***************
*** 37,40 ****
--- 49,53 ----
  			!! context.make
  			attributes_make
+ 			next.on_start
  		end
  
***************
*** 62,70 ****
  					on_error (Duplicate_namespace_declaration_error)
  				else
! 					context.add (a_value, a_prefix)
  				end
  			else
! 					-- Queue ordinary attribute for when all namespace 
! 					-- declarations have been seen as they can be used 
  					-- to declare attributes prefixes.
  				attributes_force (a_prefix, a_local_part, a_value)
--- 75,83 ----
  					on_error (Duplicate_namespace_declaration_error)
  				else
! 					context.add (a_value, a_local_part)
  				end
  			else
! 					-- Queue ordinary attribute for when all namespace
! 					-- declarations have been seen as they can be used
  					-- to declare attributes prefixes.
  				attributes_force (a_prefix, a_local_part, a_value)
***************
*** 88,92 ****
  				an_element_namespace := context.resolve_default
  			end
! 			next.on_start_tag (an_element_namespace, element_prefix, element_local_part) 
  				-- Resolve attributes.
  			from
--- 101,105 ----
  				an_element_namespace := context.resolve_default
  			end
! 			next.on_start_tag (an_element_namespace, element_prefix, element_local_part)
  				-- Resolve attributes.
  			from

Update of /cvsroot/gobo-eiffel/gobo
In directory usw-pr-cvs1:/tmp/cvs-serv11961

Modified Files:
	History.txt 
Log Message:
Keep history uptodate.

Index: History.txt
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/History.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** History.txt	3 Sep 2002 16:55:46 -0000	1.44
--- History.txt	22 Sep 2002 16:19:28 -0000	1.45
***************
*** 1,2 ****
--- 1,15 ----
+ Version 3.1 - ?
+ 
+ 	gelex:
+ 
+ 	* Feature YY_BUFFER.content is now of type KI_CHARACTER_BUFFER
+ 	  instead of KL_CHARACTER_BUFFER (Berend de Boer).
+ 
+ 	Gobo Eiffel Kernel Library:
+ 
+ 	* Moved feature `close' up to KI_INPUT_STREAM and
+ 	  KI_OUTPUT_STREAM and added feature `is_closable'
+ 	  (suggested by Franck Arnaud).
+ 
  Version 3.0 - 1 September 2002

Update of /cvsroot/gobo-eiffel/gobo/library/xml/parser/expat
In directory usw-pr-cvs1:/tmp/cvs-serv6495/library/xml/parser/expat

Modified Files:
	xm_expat_parser.e 
Log Message:
Fixed typo.

Index: xm_expat_parser.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/xml/parser/expat/xm_expat_parser.e,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** xm_expat_parser.e	19 Sep 2002 16:35:16 -0000	1.7
--- xm_expat_parser.e	22 Sep 2002 16:03:54 -0000	1.8
***************
*** 62,66 ****
  			!XM_CALLBACKS_NULL! callbacks.make
  			
! 			!XM_NULL_PARSER_RESOLVER! dtd_resolver
  			entity_resolver := dtd_resolver
  		end
--- 62,66 ----
  			!XM_CALLBACKS_NULL! callbacks.make
  			
! 			!XM_NULL_EXTERNAL_RESOLVER! dtd_resolver
  			entity_resolver := dtd_resolver
  		end

Update of /cvsroot/gobo-eiffel/gobo/library/xml/parser/interface
In directory usw-pr-cvs1:/tmp/cvs-serv6265/library/xml/parser/interface

Modified Files:
	xm_parser.e 
Log Message:
Formatting.

Index: xm_parser.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/xml/parser/interface/xm_parser.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** xm_parser.e	19 Sep 2002 16:32:04 -0000	1.3
--- xm_parser.e	22 Sep 2002 16:03:12 -0000	1.4
***************
*** 184,188 ****
  
  invariant
  	resolvers_not_void: entity_resolver /= Void and dtd_resolver /= Void
! 	
  end
--- 184,189 ----
  
  invariant
+ 
  	resolvers_not_void: entity_resolver /= Void and dtd_resolver /= Void
! 
  end

Update of /cvsroot/gobo-eiffel/gobo/test/xml/expat
In directory usw-pr-cvs1:/tmp/cvs-serv5249/test/xml/expat

Modified Files:
	test_callback.e 
Log Message:
Made sure that the invariant inherited from XM_PARSER
is not violated after returning from the creation procedure.

Index: test_callback.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/test/xml/expat/test_callback.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** test_callback.e	31 Aug 2002 12:24:16 -0000	1.5
--- test_callback.e	22 Sep 2002 16:00:40 -0000	1.6
***************
*** 19,23 ****
  			name as test_name
  		redefine
! 			set_up
  		end
  
--- 19,23 ----
  			name as test_name
  		redefine
! 			make, set_up
  		end
  
***************
*** 45,48 ****
--- 45,57 ----
  	KL_IMPORTED_STRING_ROUTINES
  	KL_SHARED_OPERATING_SYSTEM
+ 
+ feature {NONE} -- Initialization
+ 
+ 	make (an_id: INTEGER; a_variables: like variables) is
+ 			-- Create a new test case with id `an_id'.
+ 		do
+ 			precursor (an_id, a_variables)
+ 			make_expat
+ 		end
  
  feature -- Execution

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/assertion
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/assertion

Modified Files:
	et_assertion.e et_assertion_item.e et_assertion_semicolon.e 
	et_assertions.e et_tagged_expression_variant.e 
Log Message:
Continued decorating the abstract syntax tree.

Index: et_assertion.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/assertion/et_assertion.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_assertion.e	6 Apr 2002 16:27:48 -0000	1.5
--- et_assertion.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 19,23 ****
  feature -- Access
  
! 	assertion_item: ET_ASSERTION is
  			-- Assertion in list of assertions
  		do
--- 19,23 ----
  feature -- Access
  
! 	assertion: ET_ASSERTION is
  			-- Assertion in list of assertions
  		do

Index: et_assertion_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/assertion/et_assertion_item.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_assertion_item.e	6 Apr 2002 16:27:48 -0000	1.3
--- et_assertion_item.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	assertion_item: ET_ASSERTION is
  			-- Assertion in list of assertions
  		deferred
  		ensure
! 			assertion_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	assertion: ET_ASSERTION is
  			-- Assertion in list of assertions
  		deferred
  		ensure
! 			assertion_not_void: Result /= Void
  		end
  

Index: et_assertion_semicolon.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/assertion/et_assertion_semicolon.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_assertion_semicolon.e	6 Apr 2002 16:27:48 -0000	1.3
--- et_assertion_semicolon.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (an_assertion: like assertion_item; a_semicolon: like semicolon) is
  			-- Create a new assertion-semicolon.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (an_assertion: like assertion; a_semicolon: like semicolon) is
  			-- Create a new assertion-semicolon.
  		require
***************
*** 29,36 ****
  			a_semicolon_not_void: a_semicolon /= Void
  		do
! 			assertion_item := an_assertion
  			semicolon := a_semicolon
  		ensure
! 			assertion_item_set: assertion_item = an_assertion
  			semicolon_set: semicolon = a_semicolon
  		end
--- 29,36 ----
  			a_semicolon_not_void: a_semicolon /= Void
  		do
! 			assertion := an_assertion
  			semicolon := a_semicolon
  		ensure
! 			assertion_set: assertion = an_assertion
  			semicolon_set: semicolon = a_semicolon
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	assertion_item: ET_ASSERTION
  			-- Assertion in list of assertions
  
--- 38,42 ----
  feature -- Access
  
! 	assertion: ET_ASSERTION
  			-- Assertion in list of assertions
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := assertion_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := assertion.position
  		end
  

Index: et_assertions.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/assertion/et_assertions.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_assertions.e	6 Apr 2002 16:27:48 -0000	1.5
--- et_assertions.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 31,35 ****
  			i_small_enough: i <= count
  		do
! 			Result := item (i).assertion_item
  		ensure
  			assertion_not_void: Result /= Void
--- 31,35 ----
  			i_small_enough: i <= count
  		do
! 			Result := item (i).assertion
  		ensure
  			assertion_not_void: Result /= Void

Index: et_tagged_expression_variant.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/assertion/et_tagged_expression_variant.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_tagged_expression_variant.e	6 Apr 2002 16:27:48 -0000	1.3
--- et_tagged_expression_variant.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 27,46 ****
  
  	make (a_variant: like variant_keyword; a_tag: like tag;
! 		a_colon: like colon; an_expression: like expression) is
  			-- Create a new loop expression variant clause.
  		require
  			a_variant_not_void: a_variant /= Void
  			a_tag_not_void: a_tag /= Void
- 			a_colon_not_void: a_colon /= Void
  			an_expression_not_void: an_expression /= Void
  		do
  			variant_keyword := a_variant
  			tag := a_tag
- 			colon := a_colon
  			expression := an_expression
  		ensure
  			variant_keyword_set: variant_keyword = a_variant
  			tag_set: tag = a_tag
- 			colon_set: colon = a_colon
  			expression_set: expression = an_expression
  		end
--- 27,43 ----
  
  	make (a_variant: like variant_keyword; a_tag: like tag;
! 		an_expression: like expression) is
  			-- Create a new loop expression variant clause.
  		require
  			a_variant_not_void: a_variant /= Void
  			a_tag_not_void: a_tag /= Void
  			an_expression_not_void: an_expression /= Void
  		do
  			variant_keyword := a_variant
  			tag := a_tag
  			expression := an_expression
  		ensure
  			variant_keyword_set: variant_keyword = a_variant
  			tag_set: tag = a_tag
  			expression_set: expression = an_expression
  		end
***************
*** 48,61 ****
  feature -- Access
  
! 	tag: ET_IDENTIFIER
  			-- Tag
  
- 	colon: ET_SYMBOL
- 			-- ':' symbol
- 
  invariant
  
  	tag_not_void: tag /= Void
- 	colon_not_void: colon /= Void
  
  end
--- 45,54 ----
  feature -- Access
  
! 	tag: ET_TAG
  			-- Tag
  
  invariant
  
  	tag_not_void: tag /= Void
  
  end

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/parser
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/parser

Modified Files:
	et_ast_factory.e et_eiffel_parser.y 
	et_eiffel_parser_skeleton.e et_eiffel_scanner.l 
Log Message:
Continued decorating the abstract syntax tree.

Index: et_ast_factory.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/parser/et_ast_factory.e,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** et_ast_factory.e	12 Sep 2002 08:58:00 -0000	1.12
--- et_ast_factory.e	22 Sep 2002 10:53:40 -0000	1.13
***************
*** 118,122 ****
  		end
  
! 	new_attribute (a_name: ET_FEATURE_NAME; a_type: ET_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS;
  		an_id: INTEGER): ET_ATTRIBUTE is
--- 118,122 ----
  		end
  
! 	new_attribute (a_name: ET_FEATURE_NAME_ITEM; a_type: ET_DECLARED_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS;
  		an_id: INTEGER): ET_ATTRIBUTE is
***************
*** 389,393 ****
  		end
  
! 	new_colon_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_TYPE): ET_COLON_FORMAL_ARGUMENT is
  			-- New formal argument whose name is followed by a colon
  		require
--- 389,393 ----
  		end
  
! 	new_colon_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_DECLARED_TYPE): ET_COLON_FORMAL_ARGUMENT is
  			-- New formal argument whose name is followed by a colon
  		require
***************
*** 400,404 ****
  		end
  
! 	new_colon_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_TYPE): ET_COLON_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a colon
  		require
--- 400,404 ----
  		end
  
! 	new_colon_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_DECLARED_TYPE): ET_COLON_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a colon
  		require
***************
*** 411,415 ****
  		end
  
! 	new_comma_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_TYPE): ET_COMMA_FORMAL_ARGUMENT is
  			-- New formal agument whose name is followed by a comma
  		require
--- 411,426 ----
  		end
  
! 	new_colon_type (a_colon: ET_SYMBOL; a_type: ET_TYPE): ET_COLON_TYPE is
! 			-- New colon-type
! 		require
! 			a_colon_not_void: a_colon /= Void
! 			a_type_not_void: a_type /= Void
! 		do
! 			!! Result.make (a_colon, a_type)
! 		ensure
! 			colon_type_not_void: Result /= Void
! 		end
! 
! 	new_comma_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_DECLARED_TYPE): ET_COMMA_FORMAL_ARGUMENT is
  			-- New formal agument whose name is followed by a comma
  		require
***************
*** 422,426 ****
  		end
  
! 	new_comma_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_TYPE): ET_COMMA_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a comma
  		require
--- 433,437 ----
  		end
  
! 	new_comma_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_DECLARED_TYPE): ET_COMMA_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a comma
  		require
***************
*** 454,458 ****
  		end
  
! 	new_constant_attribute (a_name: ET_FEATURE_NAME; a_type: ET_TYPE;
  		a_constant: ET_CONSTANT; a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS;
  		an_id: INTEGER): ET_CONSTANT_ATTRIBUTE is
--- 465,469 ----
  		end
  
! 	new_constant_attribute (a_name: ET_FEATURE_NAME_ITEM; a_type: ET_DECLARED_TYPE;
  		a_constant: ET_CONSTANT; a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS;
  		an_id: INTEGER): ET_CONSTANT_ATTRIBUTE is
***************
*** 647,652 ****
  		end
  
! 	new_deferred_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS; an_id: INTEGER): ET_DEFERRED_FUNCTION is
--- 658,663 ----
  		end
  
! 	new_deferred_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS; an_id: INTEGER): ET_DEFERRED_FUNCTION is
***************
*** 678,682 ****
  		end
  
! 	new_deferred_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
--- 689,693 ----
  		end
  
! 	new_deferred_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
***************
*** 695,699 ****
  		end
  
! 	new_do_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_TYPE;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
--- 706,710 ----
  		end
  
! 	new_do_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS; a_type: ET_DECLARED_TYPE;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
***************
*** 704,707 ****
--- 715,719 ----
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 714,718 ****
  		end
  
! 	new_do_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
--- 726,730 ----
  		end
  
! 	new_do_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
***************
*** 722,725 ****
--- 734,738 ----
  		require
  			a_name_not_void: a_name /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 856,862 ****
  		end
  
! 	new_external_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_MANIFEST_STRING; an_alias: ET_MANIFEST_STRING;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS; an_id: INTEGER): ET_EXTERNAL_FUNCTION is
--- 869,875 ----
  		end
  
! 	new_external_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_EXTERNAL_LANGUAGE; an_alias: ET_EXTERNAL_ALIAS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS; an_id: INTEGER): ET_EXTERNAL_FUNCTION is
***************
*** 877,883 ****
  		end
  
! 	new_external_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_MANIFEST_STRING; an_alias: ET_MANIFEST_STRING;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS; an_id: INTEGER): ET_EXTERNAL_PROCEDURE is
--- 890,896 ----
  		end
  
! 	new_external_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_EXTERNAL_LANGUAGE; an_alias: ET_EXTERNAL_ALIAS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS; an_id: INTEGER): ET_EXTERNAL_PROCEDURE is
***************
*** 921,924 ****
--- 934,981 ----
  		end
  
+ 	new_feature_clause (a_fetaure: ET_TOKEN; a_clients: ET_CLASS_NAME_LIST): ET_FEATURE_CLAUSE is
+ 			-- New fetaure clause
+ 		require
+ 			a_feature_not_void: a_fetaure /= Void
+ 			a_clients_not_void: a_clients /= Void
+ 		do
+ 			!! Result.make (a_fetaure, a_clients)
+ 		ensure
+ 			feature_clause_not_void: Result /= Void
+ 		end
+ 
+ 	new_feature_clause_with_capacity (a_feature: ET_TOKEN; a_clients: ET_CLASS_NAME_LIST; nb: INTEGER): ET_FEATURE_CLAUSE is
+ 			-- New feature clause with given capacity
+ 		require
+ 			a_feature_not_void: a_feature /= Void
+ 			a_clients_not_void: a_clients /= Void
+ 			nb_positive: nb >= 0
+ 		do
+ 			!! Result.make_with_capacity (a_feature, a_clients, nb)
+ 		ensure
+ 			feature_clause_not_void: Result /= Void
+ 		end
+ 
+ 	new_feature_clauses (a_feature_clause: ET_FEATURE_CLAUSE): ET_FEATURE_CLAUSES is
+ 			-- New feature clauses
+ 		require
+ 			a_feature_clause_not_void: a_feature_clause /= Void
+ 		do
+ 			!! Result.make (a_feature_clause)
+ 		ensure
+ 			feature_clauses_not_void: Result /= Void
+ 		end
+ 
+ 	new_feature_clauses_with_capacity (a_feature_clause: ET_FEATURE_CLAUSE; nb: INTEGER): ET_FEATURE_CLAUSES is
+ 			-- New feature clauses with given capacity
+ 		require
+ 			a_feature_clause_not_void: a_feature_clause /= Void
+ 			nb_positive: nb >= 1
+ 		do
+ 			!! Result.make_with_capacity (a_feature_clause, nb)
+ 		ensure
+ 			feature_clauses_not_void: Result /= Void
+ 		end
+ 
  	new_feature_export (a_clients: ET_CLIENTS): ET_FEATURE_EXPORT is
  			-- New feature export clause
***************
*** 953,956 ****
--- 1010,1024 ----
  		end
  
+ 	new_feature_semicolon (a_feature: ET_FEATURE; a_semicolon: ET_SYMBOL): ET_FEATURE_SEMICOLON is
+ 			-- New feature-semicolon
+ 		require
+ 			a_feature_not_void: a_feature /= Void
+ 			a_semicolon_not_void: a_semicolon /= Void
+ 		do
+ 			!! Result.make (a_feature, a_semicolon)
+ 		ensure
+ 			feature_semicolon_not_void: Result /= Void
+ 		end
+ 
  	new_formal_argument_semicolon (an_argument: ET_FORMAL_ARGUMENT; a_semicolon: ET_SYMBOL): ET_FORMAL_ARGUMENT_SEMICOLON is
  			-- New formal_argument-semicolon
***************
*** 1644,1647 ****
--- 1712,1726 ----
  		end
  
+ 	new_keyword_manifest_string (a_keyword: ET_TOKEN; a_string: ET_MANIFEST_STRING): ET_KEYWORD_MANIFEST_STRING is
+ 			-- New manifest string predeced by a keyword
+ 		require
+ 			a_keyword_not_void: a_keyword /= Void
+ 			a_string_not_void: a_string /= Void
+ 		do
+ 			!! Result.make (a_keyword, a_string)
+ 		ensure
+ 			keyword_manifest_string_not_void: Result /= Void
+ 		end
+ 
  	new_like_current (a_like: ET_TOKEN; a_current: ET_TOKEN): ET_LIKE_CURRENT is
  			-- New 'like Current' type
***************
*** 1840,1845 ****
  		end
  
! 	new_once_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_TYPE;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
  		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND;
--- 1919,1924 ----
  		end
  
! 	new_once_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
  		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND;
***************
*** 1849,1852 ****
--- 1928,1932 ----
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 1870,1874 ****
  		end
  
! 	new_once_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
--- 1950,1954 ----
  		end
  
! 	new_once_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
***************
*** 1878,1881 ****
--- 1958,1962 ----
  		require
  			a_name_not_void: a_name /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 2476,2489 ****
  		end
  
! 	new_tagged_expression_variant (a_variant: ET_TOKEN; a_tag: ET_IDENTIFIER;
! 		a_colon: ET_SYMBOL; an_expression: ET_EXPRESSION): ET_TAGGED_EXPRESSION_VARIANT is
  			-- New loop tagged expression variant
  		require
  			a_variant_not_void: a_variant /= Void
  			a_tag_not_void: a_tag /= Void
- 			a_colon_not_void: a_colon /= Void
  			an_expression_not_void: an_expression /= Void
  		do
! 			!! Result.make (a_variant, a_tag, a_colon, an_expression)
  		ensure
  			tagged_expression_variant_not_void: Result /= Void
--- 2557,2569 ----
  		end
  
! 	new_tagged_expression_variant (a_variant: ET_TOKEN; a_tag: ET_TAG;
! 		an_expression: ET_EXPRESSION): ET_TAGGED_EXPRESSION_VARIANT is
  			-- New loop tagged expression variant
  		require
  			a_variant_not_void: a_variant /= Void
  			a_tag_not_void: a_tag /= Void
  			an_expression_not_void: an_expression /= Void
  		do
! 			!! Result.make (a_variant, a_tag, an_expression)
  		ensure
  			tagged_expression_variant_not_void: Result /= Void
***************
*** 2591,2595 ****
  		end
  
! 	new_unique_attribute (a_name: ET_FEATURE_NAME; a_type: ET_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS; an_id: INTEGER): ET_UNIQUE_ATTRIBUTE is
  			-- New unique attribute declaration
--- 2671,2675 ----
  		end
  
! 	new_unique_attribute (a_name: ET_FEATURE_NAME_ITEM; a_type: ET_DECLARED_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS; an_id: INTEGER): ET_UNIQUE_ATTRIBUTE is
  			-- New unique attribute declaration

Index: et_eiffel_parser.y
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/parser/et_eiffel_parser.y,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** et_eiffel_parser.y	12 Sep 2002 08:58:00 -0000	1.15
--- et_eiffel_parser.y	22 Sep 2002 10:53:40 -0000	1.16
***************
*** 38,42 ****
  %token <ET_TOKEN>              E_IF E_INDEXING E_INFIX E_INHERIT E_INSPECT
  %token <ET_TOKEN>              E_INVARIANT E_IS E_LIKE E_LOCAL E_LOOP E_OBSOLETE
! %token <ET_TOKEN>              E_ONCE E_PREFIX E_REDEFINE E_RENAME E_REQUIRE
  %token <ET_TOKEN>              E_RESCUE E_SELECT E_STRIP
  %token <ET_TOKEN>              E_THEN E_UNDEFINE E_UNIQUE E_UNTIL E_VARIANT
--- 38,42 ----
  %token <ET_TOKEN>              E_IF E_INDEXING E_INFIX E_INHERIT E_INSPECT
  %token <ET_TOKEN>              E_INVARIANT E_IS E_LIKE E_LOCAL E_LOOP E_OBSOLETE
! %token <ET_TOKEN>              E_ONCE E_ONCE_STRING E_PREFIX E_REDEFINE E_RENAME E_REQUIRE
  %token <ET_TOKEN>              E_RESCUE E_SELECT E_STRIP
  %token <ET_TOKEN>              E_THEN E_UNDEFINE E_UNIQUE E_UNTIL E_VARIANT
***************
*** 132,135 ****
--- 132,136 ----
  %type <ET_EXPRESSION>          Expression Call_chain Precursor_expression
                                 Address_mark Create_expression
+ %type <ET_EXTERNAL_ALIAS>      External_name_opt
  %type <ET_FEATURE>             Feature_declaration Single_feature_declaration
                                 Attribute_declaration Constant_declaration Unique_declaration
***************
*** 138,141 ****
--- 139,144 ----
                                 Do_function_declaration Once_function_declaration
                                 Deferred_function_declaration External_function_declaration
+ %type <ET_FEATURE_CLAUSE>      Feature_clause Feature_declaration_list
+ %type <ET_FEATURE_CLAUSES>     Features Features_opt
  %type <ET_FEATURE_EXPORT>      New_feature_export Export_feature_name_list
  %type <ET_FEATURE_NAME>        Feature_name
***************
*** 159,163 ****
  %type <ET_LOCAL_VARIABLES>     Local_declarations_opt Local_variable_list
  %type <ET_MANIFEST_ARRAY>      Manifest_array Manifest_array_expression_list
! %type <ET_MANIFEST_STRING>     Manifest_string External_name_opt
  %type <ET_MANIFEST_TUPLE>      Manifest_tuple Manifest_tuple_expression_list
  %type <ET_OBSOLETE>            Obsolete_opt
--- 162,166 ----
  %type <ET_LOCAL_VARIABLES>     Local_declarations_opt Local_variable_list
  %type <ET_MANIFEST_ARRAY>      Manifest_array Manifest_array_expression_list
! %type <ET_MANIFEST_STRING>     Manifest_string
  %type <ET_MANIFEST_TUPLE>      Manifest_tuple Manifest_tuple_expression_list
  %type <ET_OBSOLETE>            Obsolete_opt
***************
*** 182,188 ****
  %type <ET_TOKEN>               Check Create Debug Else Elseif End Ensure From If Invariant
                                 Loop Precursor Require Then Until Variant When Inspect Select
!                                Rename Redefine Export Undefine All Creation As Do Once
                                 Rescue Like Bit Local Obsolete Inherit Class Agent Feature
!                                Indexing
  %type <ET_TYPE>                Type Constraint_type
  %type <ET_VARIANT>             Variant_clause_opt
--- 185,191 ----
  %type <ET_TOKEN>               Check Create Debug Else Elseif End Ensure From If Invariant
                                 Loop Precursor Require Then Until Variant When Inspect Select
!                                Rename Redefine Export Undefine All Creation As Do Once Once_string
                                 Rescue Like Bit Local Obsolete Inherit Class Agent Feature
!                                Indexing Frozen Is Unique External Alias
  %type <ET_TYPE>                Type Constraint_type
  %type <ET_VARIANT>             Variant_clause_opt
***************
*** 190,194 ****
  %type <ET_WRITABLE>            Writable
  
! %expect 45
  %start Class_declarations
  
--- 193,197 ----
  %type <ET_WRITABLE>            Writable
  
! %expect 41
  %start Class_declarations
  
***************
*** 216,219 ****
--- 219,223 ----
  			$$.set_obsolete_message ($3)
  			$$.set_creators ($4)
+ 			$$.set_feature_clauses ($5)
  			$$.set_invariants ($6)
  			$$.set_second_indexing ($7)
***************
*** 230,233 ****
--- 234,238 ----
  		{
  			last_class.set_creators ($1)
+ 			last_class.set_feature_clauses ($2)
  			last_class.set_invariants ($3)
  			last_class.set_second_indexing ($4)
***************
*** 1072,1098 ****
  	;
  
! --NOTDONE-----------------------------------------------------------------------
  
  Features_opt: -- Empty
! 	| Features
  	;
! 	
  Features: Feature_clause
! 	| Feature_clause Features
  	;
  
  Feature_clause: Feature Clients_opt
! 			{
! 				if $2 = Void then
! 					if new_any_clients ($1.position) = Void then end
! 				end
! 			}
  	| Feature Clients_opt
! 			{
! 				if $2 = Void then
! 					if new_any_clients ($1.position) = Void then end
! 				end
! 			}
  	  Feature_declaration_list
  	;
  
--- 1077,1128 ----
  	;
  
! --------------------------------------------------------------------------------
  
  Features_opt: -- Empty
! 		-- { $$ := Void }
! 	| { add_counter } Features
! 		{
! 			$$ := $2
! 			remove_counter
! 		}
  	;
! 
  Features: Feature_clause
! 		{ $$ := new_feature_clauses_with_capacity ($1, counter_value + 1) }
! 	| Feature_clause
! 		{ increment_counter}
! 	  Features
! 		{
! 			$$ := $3
! 			$$.put_first ($1)
! 		}
  	;
  
  Feature_clause: Feature Clients_opt
! 		{
! 			if $2 = Void then
! 				last_clients := new_any_clients ($1.position)
! 				$$ := new_feature_clause ($1, last_clients)
! 			else
! 				last_clients := $2
! 				$$ := new_feature_clause ($1, last_clients)
! 			end
! 		}
  	| Feature Clients_opt
! 		{
! 			if $2 = Void then
! 				last_clients := new_any_clients ($1.position)
! 			else
! 				last_clients := $2
! 			end
! 			add_counter
! 		}
  	  Feature_declaration_list
+ 		{
+ 			$$ := $4
+ 			$$.set_clients (last_clients)
+ 			$$.set_feature_keyword ($1)
+ 			remove_counter
+ 		}
  	;
  
***************
*** 1100,1123 ****
  
  Feature_declaration_list: Feature_declaration
  	| Feature_declaration Semicolon
  		-- TODO: Syntax error
! 	| Feature_declaration Feature_declaration_list
! 	| Feature_declaration Semicolon Feature_declaration_list
  	;
  
! --NOTDONE-----------------------------------------------------------------------
  
  Feature_declaration: Single_feature_declaration
! 		{ $$ := $1; register_feature ($$) }
! 	| E_FROZEN Single_feature_declaration
! 		{ $$ := $2; register_frozen_feature ($$) }
! 	| Feature_name ',' Feature_declaration
! 		{ $$ := new_synonym_feature ($1, $3); register_feature ($$) }
  	| Feature_name Feature_declaration
! 		{ $$ := new_synonym_feature ($1, $2); register_feature ($$) }
! 	| E_FROZEN Feature_name ',' Feature_declaration
! 		{ $$ := new_synonym_feature ($2, $4); register_frozen_feature ($$) }
! 	| E_FROZEN Feature_name Feature_declaration
! 		{ $$ := new_synonym_feature ($2, $3); register_frozen_feature ($$) }
  	;
  
--- 1130,1194 ----
  
  Feature_declaration_list: Feature_declaration
+ 		{
+ 			$$ := new_feature_clause_with_capacity (counter_value + 1)
+ 			$$.put_first ($1)
+ 		}
  	| Feature_declaration Semicolon
  		-- TODO: Syntax error
! 		{
! 			$$ := new_feature_clause_with_capacity (counter_value + 1)
! 			$$.put_first (new_feature_semicolon ($1, $2))
! 		}
! 	| Feature_declaration
! 		{ increment_counter }
! 	  Feature_declaration_list
! 		{
! 			$$ := $3
! 			$$.put_first ($1)
! 		}
! 	| Feature_declaration Semicolon
! 		{ increment_counter }
! 	  Feature_declaration_list
! 		{
! 			$$ := $4
! 			$$.put_first (new_feature_semicolon ($1, $2))
! 		}
  	;
  
! --------------------------------------------------------------------------------
  
  Feature_declaration: Single_feature_declaration
! 		{
! 			$$ := $1
! 			register_feature ($$)
! 		}
! 	| Frozen Single_feature_declaration
! 		{
! 			$$ := $2
! 			$$.set_frozen_keyword ($1)
! 			register_feature ($$)
! 		}
! 	| Feature_name Comma Feature_declaration
! 		{
! 			$$ := new_synonym_feature (new_feature_name_comma ($1, $2), $3)
! 			register_feature ($$)
! 		}
  	| Feature_name Feature_declaration
! 		{
! 			$$ := new_synonym_feature ($1, $2)
! 			register_feature ($$)
! 		}
! 	| Frozen Feature_name Comma Feature_declaration
! 		{
! 			$$ := new_synonym_feature (new_feature_name_comma ($2, $3), $4)
! 			$$.set_frozen_keyword ($1)
! 			register_feature ($$)
! 		}
! 	| Frozen Feature_name Feature_declaration
! 		{
! 			$$ := new_synonym_feature ($2, $3)
! 			$$.set_frozen_keyword ($1)
! 			register_feature ($$)
! 		}
  	;
  
***************
*** 1146,1211 ****
  	;
  
! Attribute_declaration: Feature_name Formal_arguments_opt ':' Type
! 		{ $$ := new_attribute ($1, $2, $4) }
  	;
  
! Constant_declaration: Feature_name Formal_arguments_opt ':' Type E_IS Manifest_constant
! 		{ $$ := new_constant_attribute ($1, $2, $4, $6) }
  	;
  
! Unique_declaration: Feature_name Formal_arguments_opt ':' Type E_IS E_UNIQUE
! 		{ $$ := new_unique_attribute ($1, $2, $4) }
  	;
  
! Do_procedure_declaration: Feature_name Formal_arguments_opt E_IS
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Do_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_do_procedure ($1, $2, $4, $5, $6, $7, $8, $9) }
  	;
  
! Once_procedure_declaration: Feature_name Formal_arguments_opt E_IS
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Once_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_once_procedure ($1, $2, $4, $5, $6, $7, $8, $9) }
  	;
  
! Deferred_procedure_declaration: Feature_name Formal_arguments_opt E_IS
! 	Obsolete_opt Precondition_opt E_DEFERRED Postcondition_opt End
! 		{ $$ := new_deferred_procedure ($1, $2, $4, $5, $7) }
  	;
  
! External_procedure_declaration: Feature_name Formal_arguments_opt E_IS
! 	Obsolete_opt Precondition_opt E_EXTERNAL Manifest_string
  	External_name_opt Postcondition_opt End
! 		{ $$ := new_external_procedure ($1, $2, $4, $5, $7, $8, $9) }
  	;
  
! Do_function_declaration: Feature_name Formal_arguments_opt ':' Type E_IS
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Do_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_do_function ($1, $2, $4, $6, $7, $8, $9, $10, $11) }
  	;
  
! Once_function_declaration: Feature_name Formal_arguments_opt ':' Type E_IS
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Once_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_once_function ($1, $2, $4, $6, $7, $8, $9, $10, $11) }
  	;
  
! Deferred_function_declaration: Feature_name Formal_arguments_opt ':' Type E_IS
! 	Obsolete_opt Precondition_opt E_DEFERRED Postcondition_opt End
! 		{ $$ := new_deferred_function ($1, $2, $4, $6, $7, $9) }
  	;
  
! External_function_declaration: Feature_name Formal_arguments_opt ':' Type E_IS
! 	Obsolete_opt Precondition_opt E_EXTERNAL Manifest_string
  	External_name_opt Postcondition_opt End
! 		{ $$ := new_external_function ($1, $2, $4, $6, $7, $9, $10, $11) }
  	;
  
  External_name_opt: -- Empty
  		-- { $$ := Void }
! 	| E_ALIAS Manifest_string
! 		{ $$ := $2 }
  	;
  
--- 1217,1284 ----
  	;
  
! Attribute_declaration: Feature_name Formal_arguments_opt Colon Type
! 		{ $$ := new_attribute ($1, $2, new_colon_type ($3, $4)) }
  	;
  
! Constant_declaration: Feature_name Formal_arguments_opt Colon Type Is Manifest_constant
! 		{
! 			$$ := new_constant_attribute ($1, $2, new_colon_type ($3, $4), $5, $6)
! 		}
  	;
  
! Unique_declaration: Feature_name Formal_arguments_opt Colon Type Is Unique
! 		{ $$ := new_unique_attribute ($1, $2, new_colon_type ($3, $4), $5, $6) }
  	;
  
! Do_procedure_declaration: Feature_name Formal_arguments_opt Is
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Do_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_do_procedure ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) }
  	;
  
! Once_procedure_declaration: Feature_name Formal_arguments_opt Is
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Once_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_once_procedure ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) }
  	;
  
! Deferred_procedure_declaration: Feature_name Formal_arguments_opt Is
! 	Obsolete_opt Precondition_opt Deferred Postcondition_opt End
! 		{ $$ := new_deferred_procedure ($1, $2, $3, $4, $5, $6, $7, $8) }
  	;
  
! External_procedure_declaration: Feature_name Formal_arguments_opt Is
! 	Obsolete_opt Precondition_opt External Manifest_string
  	External_name_opt Postcondition_opt End
! 		{ $$ := new_external_procedure ($1, $2, $3, $4, $5, new_external_language ($6, $7), $8, $9, $10) }
  	;
  
! Do_function_declaration: Feature_name Formal_arguments_opt Colon Type Is
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Do_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_do_function ($1, $2, new_colon_type ($3, $4), $5, $6, $7, $8, $9, $10, $11, $12) }
  	;
  
! Once_function_declaration: Feature_name Formal_arguments_opt Colon Type Is
  	Obsolete_opt Precondition_opt Local_declarations_opt
  	Once_compound Postcondition_opt Rescue_opt End
! 		{ $$ := new_once_function ($1, $2, new_colon_type ($3, $4), $5, $6, $7, $8, $9, $10, $11, $12) }
  	;
  
! Deferred_function_declaration: Feature_name Formal_arguments_opt Colon Type Is
! 	Obsolete_opt Precondition_opt Deferred Postcondition_opt End
! 		{ $$ := new_deferred_function ($1, $2, new_colon_type ($3, $4), $5, $6, $7, $8, $9, $10) }
  	;
  
! External_function_declaration: Feature_name Formal_arguments_opt Colon Type Is
! 	Obsolete_opt Precondition_opt External Manifest_string
  	External_name_opt Postcondition_opt End
! 		{ $$ := new_external_function ($1, $2, new_colon_type ($3, $4), $5, $6, $7, new_external_language ($8, $9), $10, $11, $12) }
  	;
  
  External_name_opt: -- Empty
  		-- { $$ := Void }
! 	| Alias Manifest_string
! 		{ $$ := new_external_alias ($1, $2) }
  	;
  
***************
*** 1555,1564 ****
  		{
  			$$ := new_formal_arguments_with_capacity (counter_value + 1)
! 			$$.put_first (new_colon_formal_argument (new_argument_name_colon ($1, $2), $3))
  		}
  	| Identifier Colon Type Semicolon
  		{
  			$$ := new_formal_arguments_with_capacity (counter_value + 1)
! 			$$.put_first (new_formal_argument_semicolon (new_colon_formal_argument (new_argument_name_colon ($1, $2), $3), $4))
  		}
  	| Identifier Comma
--- 1628,1637 ----
  		{
  			$$ := new_formal_arguments_with_capacity (counter_value + 1)
! 			$$.put_first (new_colon_formal_argument ($1, new_colon_type ($2, $3)))
  		}
  	| Identifier Colon Type Semicolon
  		{
  			$$ := new_formal_arguments_with_capacity (counter_value + 1)
! 			$$.put_first (new_formal_argument_semicolon (new_colon_formal_argument ($1, new_colon_type ($2, $3)), $4))
  		}
  	| Identifier Comma
***************
*** 1581,1585 ****
  		{
  			$$ := $6
! 			$$.put_first (new_formal_argument_semicolon (new_colon_formal_argument (new_argument_name_colon ($1, $2), $3), $4))
  		}
  	| Identifier Colon Type
--- 1654,1658 ----
  		{
  			$$ := $6
! 			$$.put_first (new_formal_argument_semicolon (new_colon_formal_argument ($1, new_colon_type ($2, $3)), $4))
  		}
  	| Identifier Colon Type
***************
*** 1588,1592 ****
  		{
  			$$ := $5
! 			$$.put_first (new_colon_formal_argument (new_argument_name_colon ($1, $2), $3))
  		}
  	;
--- 1661,1665 ----
  		{
  			$$ := $5
! 			$$.put_first (new_colon_formal_argument ($1, new_colon_type ($2, $3)))
  		}
  	;
***************
*** 1611,1620 ****
  		{
  			$$ := new_local_variables_with_capacity (counter_value + 1)
! 			$$.put_first (new_colon_local_variable (new_local_name_colon ($1, $2), $3))
  		}
  	| Identifier Colon Type Semicolon
  		{
  			$$ := new_local_variables_with_capacity (counter_value + 1)
! 			$$.put_first (new_local_variable_semicolon (new_colon_local_variable (new_local_name_colon ($1, $2), $3), $4))
  		}
  	| Identifier Comma
--- 1684,1693 ----
  		{
  			$$ := new_local_variables_with_capacity (counter_value + 1)
! 			$$.put_first (new_colon_local_variable ($1, new_colon_type ($2, $3)))
  		}
  	| Identifier Colon Type Semicolon
  		{
  			$$ := new_local_variables_with_capacity (counter_value + 1)
! 			$$.put_first (new_local_variable_semicolon (new_colon_local_variable ($1, new_colon_type ($2, $3)), $4))
  		}
  	| Identifier Comma
***************
*** 1637,1641 ****
  		{
  			$$ := $6
! 			$$.put_first (new_local_variable_semicolon (new_colon_local_variable (new_local_name_colon ($1, $2), $3), $4))
  		}
  	| Identifier Colon Type
--- 1710,1714 ----
  		{
  			$$ := $6
! 			$$.put_first (new_local_variable_semicolon (new_colon_local_variable ($1, new_colon_type ($2, $3)), $4))
  		}
  	| Identifier Colon Type
***************
*** 1644,1648 ****
  		{
  			$$ := $5
! 			$$.put_first (new_colon_local_variable (new_local_name_colon ($1, $2), $3))
  		}
  	;
--- 1717,1721 ----
  		{
  			$$ := $5
! 			$$.put_first (new_colon_local_variable ($1, new_colon_type ($2, $3)))
  		}
  	;
***************
*** 1707,1711 ****
  		{ $$ := new_expression_variant ($1, $2) }
  	| Variant Identifier Colon Expression
! 		{ $$ := new_tagged_expression_variant ($1, $2, $3, $4) }
  	;
  
--- 1780,1784 ----
  		{ $$ := new_expression_variant ($1, $2) }
  	| Variant Identifier Colon Expression
! 		{ $$ := new_tagged_expression_variant ($1, new_tag ($2, $3), $4) }
  	;
  
***************
*** 2349,2353 ****
  	| Manifest_string
  		{ $$ := $1 }
! 	| Once Manifest_string
  		{ $$ := new_once_manifest_string ($1, $2) }
  	| Bit_constant
--- 2422,2439 ----
  	| Manifest_string
  		{ $$ := $1 }
! 	| Once_string Manifest_string
! -- We need to make the distinction between once keywords followed
! -- by a manifest string and once keywords introducing a once-routine
! -- because otherwise we would need to have two look-ahead tokens
! -- to figure out that the first once keyword in the following example
! -- in part of a once manifest string expression and the second is
! -- part of the compound of the once routine:
! --   f is
! --      require
! --         once "foo" /= Void
! --      once
! --         do_nothing
! --      end
! -- Hence the use of 'Once_string' instead of 'Once'.
  		{ $$ := new_once_manifest_string ($1, $2) }
  	| Bit_constant
***************
*** 3037,3040 ****
--- 3123,3137 ----
  	;
  
+ Alias: E_ALIAS
+ 		{ $$ := $1 }
+ 	| E_ALIAS E_BREAK
+ 		{
+ 			$$ := $1
+ 			if keep_all_breaks or keep_all_comments then
+ 				$$.set_break ($2)
+ 			end
+ 		}
+ 	;
+ 
  All: E_ALL
  		{ $$ := $1 }
***************
*** 3222,3225 ****
--- 3319,3333 ----
  	;
  
+ External: E_EXTERNAL
+ 		{ $$ := $1 }
+ 	| E_EXTERNAL E_BREAK
+ 		{
+ 			$$ := $1
+ 			if keep_all_breaks or keep_all_comments then
+ 				$$.set_break ($2)
+ 			end
+ 		}
+ 	;
+ 
  Feature: E_FEATURE
  		{ $$ := $1 }
***************
*** 3244,3247 ****
--- 3352,3366 ----
  	;
  
+ Frozen: E_FROZEN
+ 		{ $$ := $1 }
+ 	| E_FROZEN E_BREAK
+ 		{
+ 			$$ := $1
+ 			if keep_all_breaks or keep_all_comments then
+ 				$$.set_break ($2)
+ 			end
+ 		}
+ 	;
+ 
  Indexing: E_INDEXING
  		{ $$ := $1 }
***************
*** 3299,3302 ****
--- 3418,3430 ----
  	;
  
+ Is: E_IS
+ 		{ $$ := $1 }
+ 	| E_IS E_BREAK
+ 		{
+ 			$$ := $1
+ 			$$.set_break ($2)
+ 		}
+ 	;
+ 
  Like: E_LIKE
  		{ $$ := $1 }
***************
*** 3354,3357 ****
--- 3482,3496 ----
  	;
  
+ Once_string: E_ONCE_STRING
+ 		{ $$ := $1 }
+ 	| E_ONCE_STRING E_BREAK
+ 		{
+ 			$$ := $1
+ 			if keep_all_breaks or keep_all_comments then
+ 				$$.set_break ($2)
+ 			end
+ 		}
+ 	;
+ 
  Precursor: E_PRECURSOR
  		{ $$ := $1 }
***************
*** 3483,3486 ****
--- 3622,3634 ----
  				$$.set_break ($2)
  			end
+ 		}
+ 	;
+ 
+ Unique: E_UNIQUE
+ 		{ $$ := $1 }
+ 	| E_UNIQUE E_BREAK
+ 		{
+ 			$$ := $1
+ 			$$.set_break ($2)
  		}
  	;

Index: et_eiffel_parser_skeleton.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/parser/et_eiffel_parser_skeleton.e,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** et_eiffel_parser_skeleton.e	12 Sep 2002 08:58:00 -0000	1.15
--- et_eiffel_parser_skeleton.e	22 Sep 2002 10:53:40 -0000	1.16
***************
*** 102,105 ****
--- 102,110 ----
  			a_cluster_not_void: a_cluster /= Void
  		do
+ 			debug ("GELINT")
+ 				std.error.put_string ("Parse file '")
+ 				std.error.put_string (a_filename)
+ 				std.error.put_line ("%'")
+ 			end
  			filename := a_filename
  			cluster := a_cluster
***************
*** 124,139 ****
  		end
  
- 	register_frozen_feature (a_feature: ET_FEATURE) is
- 			-- Register `a_feature' in `last_class'.
- 		require
- 			a_feature_not_void: a_feature /= Void
- 			has_last_class: has_last_class
- 		do
- 			a_feature.set_frozen
- 			last_class.put_feature (a_feature)
- 		ensure
- 			frozen_feature: a_feature.is_frozen
- 		end
- 
  	set_formal_generic_parameters (a_generics: ET_FORMAL_GENERIC_PARAMETERS) is
  			-- Set formal generic parameters of `last_class'.
--- 129,132 ----
***************
*** 319,323 ****
  		end
  
! 	new_attribute (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_TYPE): ET_ATTRIBUTE is
  			-- New attribute declaration
  		require
--- 312,316 ----
  		end
  
! 	new_attribute (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_DECLARED_TYPE): ET_ATTRIBUTE is
  			-- New attribute declaration
  		require
***************
*** 482,488 ****
  
  			debug ("GELINT")
! 				std.error.put_string ("Parse class `")
  				std.error.put_string (a_name.name)
! 				std.error.put_string ("'%N")
  			end
  		ensure
--- 475,481 ----
  
  			debug ("GELINT")
! 				std.error.put_string ("Parse class '")
  				std.error.put_string (a_name.name)
! 				std.error.put_line ("%'")
  			end
  		ensure
***************
*** 535,539 ****
  		end
  
! 	new_colon_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_TYPE): ET_COLON_FORMAL_ARGUMENT is
  			-- New formal argument whose name is followed by a colon
  		require
--- 528,532 ----
  		end
  
! 	new_colon_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_DECLARED_TYPE): ET_COLON_FORMAL_ARGUMENT is
  			-- New formal argument whose name is followed by a colon
  		require
***************
*** 546,550 ****
  		end
  
! 	new_colon_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_TYPE): ET_COLON_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a colon
  		require
--- 539,543 ----
  		end
  
! 	new_colon_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_DECLARED_TYPE): ET_COLON_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a colon
  		require
***************
*** 557,561 ****
  		end
  
! 	new_comma_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_TYPE): ET_COMMA_FORMAL_ARGUMENT is
  			-- New formal agument whose name is followed by a comma
  		require
--- 550,571 ----
  		end
  
! 	new_colon_type (a_colon: ET_SYMBOL; a_type: ET_TYPE): ET_DECLARED_TYPE is
! 			-- New colon-type
! 		require
! 			a_colon_not_void: a_colon /= Void
! 			a_type_not_void: a_type /= Void
! 		do
! 			if keep_all_breaks then
! 				Result := ast_factory.new_colon_type (a_colon, a_type)
! 			elseif keep_all_comments and a_colon.has_comment then
! 				Result := ast_factory.new_colon_type (a_colon, a_type)
! 			else
! 				Result := a_type
! 			end
! 		ensure
! 			colon_type_not_void: Result /= Void
! 		end
! 
! 	new_comma_formal_argument (a_name: ET_ARGUMENT_NAME; a_type: ET_DECLARED_TYPE): ET_COMMA_FORMAL_ARGUMENT is
  			-- New formal agument whose name is followed by a comma
  		require
***************
*** 568,572 ****
  		end
  
! 	new_comma_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_TYPE): ET_COMMA_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a comma
  		require
--- 578,582 ----
  		end
  
! 	new_comma_local_variable (a_name: ET_LOCAL_NAME; a_type: ET_DECLARED_TYPE): ET_COMMA_LOCAL_VARIABLE is
  			-- New local variable whose name is followed by a comma
  		require
***************
*** 603,611 ****
  
  	new_constant_attribute (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE; a_constant: ET_CONSTANT): ET_CONSTANT_ATTRIBUTE is
  			-- New constant attribute declaration
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
  			a_constant_not_void: a_constant /= Void
  			last_clients_not_void: last_clients /= Void
--- 613,622 ----
  
  	new_constant_attribute (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_is: ET_TOKEN; a_constant: ET_CONSTANT): ET_CONSTANT_ATTRIBUTE is
  			-- New constant attribute declaration
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			an_is_not_void: an_is /= Void
  			a_constant_not_void: a_constant /= Void
  			last_clients_not_void: last_clients /= Void
***************
*** 613,616 ****
--- 624,628 ----
  		do
  			Result := universe.new_constant_attribute (a_name, a_type, a_constant, last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
  		ensure
  			constant_attribute_not_void: Result /= Void
***************
*** 806,815 ****
  
  	new_deferred_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_postconditions: ET_POSTCONDITIONS): ET_DEFERRED_FUNCTION is
  			-- New deferred function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 818,831 ----
  
  	new_deferred_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_is: ET_TOKEN; an_obsolete: ET_OBSOLETE;
! 		a_preconditions: ET_PRECONDITIONS; a_deferred: ET_DEFERRED_KEYWORD;
! 		a_postconditions: ET_POSTCONDITIONS; an_end: ET_TOKEN): ET_DEFERRED_FUNCTION is
  			-- New deferred function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			an_is_not_void: an_is /= Void
+ 			a_deferred_not_void: a_deferred /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 818,821 ****
--- 834,840 ----
  				a_type, an_obsolete, a_preconditions, a_postconditions,
  				last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_deferred_keyword (a_deferred)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			deferred_function_not_void: Result /= Void
***************
*** 823,831 ****
  
  	new_deferred_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_postconditions: ET_POSTCONDITIONS): ET_DEFERRED_PROCEDURE is
  			-- New deferred procedure
  		require
  			a_name_not_void: a_name /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 842,854 ----
  
  	new_deferred_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		an_is: ET_TOKEN; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_deferred: ET_DEFERRED_KEYWORD; a_postconditions: ET_POSTCONDITIONS;
! 		an_end: ET_TOKEN): ET_DEFERRED_PROCEDURE is
  			-- New deferred procedure
  		require
  			a_name_not_void: a_name /= Void
+ 			an_is_not_void: an_is /= Void
+ 			a_deferred_not_void: a_deferred /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 834,849 ****
  				an_obsolete, a_preconditions, a_postconditions,
  				last_clients, last_class)
  		ensure
  			deferred_procedure_not_void: Result /= Void
  		end
  
! 	new_do_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_TYPE;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
! 		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND): ET_DO_FUNCTION is
  			-- New do function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 857,878 ----
  				an_obsolete, a_preconditions, a_postconditions,
  				last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_deferred_keyword (a_deferred)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			deferred_procedure_not_void: Result /= Void
  		end
  
! 	new_do_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_DECLARED_TYPE;
! 		an_is: ET_TOKEN; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND; a_postconditions: ET_POSTCONDITIONS;
! 		a_rescue: ET_COMPOUND; an_end: ET_TOKEN): ET_DO_FUNCTION is
  			-- New do function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			an_is_not_void: an_is /= Void
+ 			a_compound_not_void: a_compound /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 853,867 ****
  				a_compound, a_postconditions, a_rescue,
  				last_clients, last_class)
  		ensure
  			do_function_not_void: Result /= Void
  		end
  
! 	new_do_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
! 		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND): ET_DO_PROCEDURE is
  			-- New do procedure
  		require
  			a_name_not_void: a_name /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 882,901 ----
  				a_compound, a_postconditions, a_rescue,
  				last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			do_function_not_void: Result /= Void
  		end
  
! 	new_do_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; an_is: ET_TOKEN
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS; a_locals: ET_LOCAL_VARIABLES;
! 		a_compound: ET_COMPOUND; a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND;
! 		an_end: ET_TOKEN): ET_DO_PROCEDURE is
  			-- New do procedure
  		require
  			a_name_not_void: a_name /= Void
+ 			an_is_not_void: an_is /= Void
+ 			a_compound_not_void: a_compound /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 870,873 ****
--- 904,909 ----
  				an_obsolete, a_preconditions, a_locals, a_compound,
  				a_postconditions, a_rescue, last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			do_procedure_not_void: Result /= Void
***************
*** 982,994 ****
  		end
  
  	new_external_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_MANIFEST_STRING; an_alias: ET_MANIFEST_STRING;
! 		a_postconditions: ET_POSTCONDITIONS): ET_EXTERNAL_FUNCTION is
  			-- New external function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
  			a_language_not_void: a_language /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 1018,1050 ----
  		end
  
+ 	new_external_alias (a_keyword: ET_TOKEN; a_string: ET_MANIFEST_STRING): ET_EXTERNAL_ALIAS is
+ 			-- New external alias
+ 		require
+ 			a_keyword_not_void: a_keyword /= Void
+ 			a_string_not_void: a_string /= Void
+ 		do
+ 			if keep_all_breaks then
+ 				Result := ast_factory.new_keyword_manifest_string (a_keyword, a_string)
+ 			elseif keep_all_comments and a_keyword.has_comment then
+ 				Result := ast_factory.new_keyword_manifest_string (a_keyword, a_string)
+ 			else
+ 				Result := a_string
+ 			end
+ 		ensure
+ 			external_alias_not_void: Result /= Void
+ 		end
+ 
  	new_external_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_is: ET_TOKEN; an_obsolete: ET_OBSOLETE;
! 		a_preconditions: ET_PRECONDITIONS; a_language: ET_EXTERNAL_LANGUAGE;
! 		an_alias: ET_EXTERNAL_ALIAS; a_postconditions: ET_POSTCONDITIONS;
! 		an_end: ET_TOKEN): ET_EXTERNAL_FUNCTION is
  			-- New external function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			an_is_not_void: an_is /= Void
  			a_language_not_void: a_language /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 997,1012 ****
  				a_type, an_obsolete, a_preconditions, a_language, an_alias,
  				a_postconditions, last_clients, last_class)
  		ensure
  			external_function_not_void: Result /= Void
  		end
  
  	new_external_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_MANIFEST_STRING; an_alias: ET_MANIFEST_STRING;
! 		a_postconditions: ET_POSTCONDITIONS): ET_EXTERNAL_PROCEDURE is
  			-- New external procedure
  		require
  			a_name_not_void: a_name /= Void
  			a_language_not_void: a_language /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 1053,1089 ----
  				a_type, an_obsolete, a_preconditions, a_language, an_alias,
  				a_postconditions, last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			external_function_not_void: Result /= Void
  		end
  
+ 	new_external_language (a_keyword: ET_TOKEN; a_string: ET_MANIFEST_STRING): ET_EXTERNAL_LANGUAGE is
+ 			-- New external language
+ 		require
+ 			a_keyword_not_void: a_keyword /= Void
+ 			a_string_not_void: a_string /= Void
+ 		do
+ 			if keep_all_breaks then
+ 				Result := ast_factory.new_keyword_manifest_string (a_keyword, a_string)
+ 			elseif keep_all_comments and a_keyword.has_comment then
+ 				Result := ast_factory.new_keyword_manifest_string (a_keyword, a_string)
+ 			else
+ 				Result := a_string
+ 			end
+ 		ensure
+ 			external_language_not_void: Result /= Void
+ 		end
+ 
  	new_external_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		an_is: ET_TOKEN; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_EXTERNAL_LANGUAGE; an_alias: ET_EXTERNAL_ALIAS;
! 		a_postconditions: ET_POSTCONDITIONS; an_end: ET_TOKEN): ET_EXTERNAL_PROCEDURE is
  			-- New external procedure
  		require
  			a_name_not_void: a_name /= Void
+ 			an_is_not_void: an_is /= Void
  			a_language_not_void: a_language /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 1015,1018 ****
--- 1092,1097 ----
  				an_obsolete, a_preconditions, a_language, an_alias,
  				a_postconditions, last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			external_procedure_not_void: Result /= Void
***************
*** 1030,1033 ****
--- 1109,1157 ----
  		end
  
+ 	new_feature_clause (a_feature: ET_TOKEN; a_clients: ET_CLASS_NAME_LIST): ET_FEATURE_CLAUSE is
+ 			-- New feature clause
+ 		require
+ 			a_feature_not_void: a_feature /= Void
+ 			a_clients_not_void: a_clients /= Void
+ 		do
+ 			Result := ast_factory.new_feature_clause (a_feature, a_clients)
+ 		ensure
+ 			feature_clause_not_void: Result /= Void
+ 		end
+ 
+ 	new_feature_clause_with_capacity (nb: INTEGER): ET_FEATURE_CLAUSE is
+ 			-- New feature clause with given capacity
+ 		require
+ 			nb_positive: nb >= 0
+ 		local
+ 			a_feature: ET_TOKEN
+ 		do
+ 			a_feature := tokens.feature_keyword
+ 			Result := ast_factory.new_feature_clause_with_capacity (a_feature, dummy_clients, nb)
+ 		ensure
+ 			feature_clause_not_void: Result /= Void
+ 		end
+ 
+ 	new_feature_clauses (a_feature_clause: ET_FEATURE_CLAUSE): ET_FEATURE_CLAUSES is
+ 			-- New feature clauses
+ 		require
+ 			a_feature_clause_not_void: a_feature_clause /= Void
+ 		do
+ 			Result := ast_factory.new_feature_clauses (a_feature_clause)
+ 		ensure
+ 			feature_clauses_not_void: Result /= Void
+ 		end
+ 
+ 	new_feature_clauses_with_capacity (a_feature_clause: ET_FEATURE_CLAUSE; nb: INTEGER): ET_FEATURE_CLAUSES is
+ 			-- New feature clauses with given capacity
+ 		require
+ 			a_feature_clause_not_void: a_feature_clause /= Void
+ 			nb_positive: nb >= 1
+ 		do
+ 			Result := ast_factory.new_feature_clauses_with_capacity (a_feature_clause, nb)
+ 		ensure
+ 			feature_clauses_not_void: Result /= Void
+ 		end
+ 
  	new_feature_export (a_clients: ET_CLIENTS): ET_FEATURE_EXPORT is
  			-- New feature export clause
***************
*** 1067,1102 ****
  		end
  
! 	new_argument_name_colon (a_name: ET_IDENTIFIER; a_colon: ET_SYMBOL): ET_ARGUMENT_NAME is
! 			-- New argument_name-colon
  		require
  			a_name_not_void: a_name /= Void
! 			a_colon_not_void: a_colon /= Void
  		do
  			if keep_all_breaks then
! 				Result := ast_factory.new_identifier_colon (a_name, a_colon)
! 			elseif keep_all_comments and a_colon.has_comment then
! 				Result := ast_factory.new_identifier_colon (a_name, a_colon)
  			else
  				Result := a_name
  			end
  		ensure
! 			argument_name_colon_not_void: Result /= Void
  		end
  
! 	new_argument_name_comma (a_name: ET_IDENTIFIER; a_comma: ET_SYMBOL): ET_ARGUMENT_NAME is
! 			-- New argument_name-comma
  		require
! 			a_name_not_void: a_name /= Void
! 			a_comma_not_void: a_comma /= Void
  		do
  			if keep_all_breaks then
! 				Result := ast_factory.new_identifier_comma (a_name, a_comma)
! 			elseif keep_all_comments and a_comma.has_comment then
! 				Result := ast_factory.new_identifier_comma (a_name, a_comma)
  			else
! 				Result := a_name
  			end
  		ensure
! 			argument_name_comma_not_void: Result /= Void
  		end
  
--- 1191,1228 ----
  		end
  
! 	new_argument_name_comma (a_name: ET_IDENTIFIER; a_comma: ET_SYMBOL): ET_ARGUMENT_NAME is
! 			-- New argument_name-comma
  		require
  			a_name_not_void: a_name /= Void
! 			a_comma_not_void: a_comma /= Void
  		do
  			if keep_all_breaks then
! 				Result := ast_factory.new_identifier_comma (a_name, a_comma)
! 			elseif keep_all_comments and a_comma.has_comment then
! 				Result := ast_factory.new_identifier_comma (a_name, a_comma)
  			else
  				Result := a_name
  			end
  		ensure
! 			argument_name_comma_not_void: Result /= Void
  		end
  
! 	new_feature_semicolon (a_feature: ET_FEATURE; a_semicolon: ET_SYMBOL): ET_FEATURE_ITEM is
! 			-- New feature-semicolon
  		require
! 			a_feature_not_void: a_feature /= Void
! 			a_semicolon_not_void: a_semicolon /= Void
  		do
  			if keep_all_breaks then
! 				Result := ast_factory.new_feature_semicolon (a_feature, a_semicolon)
! 			elseif keep_all_comments and a_semicolon.has_comment then
! 				Result := ast_factory.new_feature_semicolon (a_feature, a_semicolon)
! 			elseif keep_header_comments and a_semicolon.has_comment then
! 				Result := ast_factory.new_feature_semicolon (a_feature, a_semicolon)
  			else
! 				Result := a_feature
  			end
  		ensure
! 			feature_semicolon_not_void: Result /= Void
  		end
  
***************
*** 1632,1652 ****
  		end
  
- 	new_local_name_colon (a_name: ET_IDENTIFIER; a_colon: ET_SYMBOL): ET_LOCAL_NAME is
- 			-- New local_name-colon
- 		require
- 			a_name_not_void: a_name /= Void
- 			a_colon_not_void: a_colon /= Void
- 		do
- 			if keep_all_breaks then
- 				Result := ast_factory.new_identifier_colon (a_name, a_colon)
- 			elseif keep_all_comments and a_colon.has_comment then
- 				Result := ast_factory.new_identifier_colon (a_name, a_colon)
- 			else
- 				Result := a_name
- 			end
- 		ensure
- 			local_name_colon_not_void: Result /= Void
- 		end
- 
  	new_local_name_comma (a_name: ET_IDENTIFIER; a_comma: ET_SYMBOL): ET_LOCAL_NAME is
  			-- New local_name-comma
--- 1758,1761 ----
***************
*** 1863,1874 ****
  		end
  
! 	new_once_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_TYPE;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
! 		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND): ET_ONCE_FUNCTION is
  			-- New once function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 1972,1986 ----
  		end
  
! 	new_once_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_DECLARED_TYPE;
! 		an_is: ET_TOKEN; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
! 		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND; an_end: ET_TOKEN): ET_ONCE_FUNCTION is
  			-- New once function
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			an_is_not_void: an_is /= Void
+ 			a_compound_not_void: a_compound /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 1877,1880 ****
--- 1989,1994 ----
  				a_type, an_obsolete, a_preconditions, a_locals, a_compound,
  				a_postconditions, a_rescue, last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			once_function_not_void: Result /= Void
***************
*** 1893,1902 ****
  
  	new_once_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
! 		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND): ET_ONCE_PROCEDURE is
  			-- New once procedure
  		require
  			a_name_not_void: a_name /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
--- 2007,2019 ----
  
  	new_once_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		an_is: ET_TOKEN; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
! 		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND; an_end: ET_TOKEN): ET_ONCE_PROCEDURE is
  			-- New once procedure
  		require
  			a_name_not_void: a_name /= Void
+ 			an_is_not_void: an_is /= Void
+ 			a_compound_not_void: a_compound /= Void
+ 			an_end_not_void: an_end /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
***************
*** 1905,1908 ****
--- 2022,2027 ----
  				an_obsolete, a_preconditions, a_locals, a_compound,
  				a_postconditions, a_rescue, last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_end_keyword (an_end)
  		ensure
  			once_procedure_not_void: Result /= Void
***************
*** 2387,2391 ****
  		end
  
! 	new_synonym_feature (a_name: ET_FEATURE_NAME; a_feature: ET_FEATURE): ET_FEATURE is
  			-- New synomym for feature `a_feature'
  		require
--- 2506,2510 ----
  		end
  
! 	new_synonym_feature (a_name: ET_FEATURE_NAME_ITEM; a_feature: ET_FEATURE): ET_FEATURE is
  			-- New synomym for feature `a_feature'
  		require
***************
*** 2393,2397 ****
  			a_feature_not_void: a_feature /= Void
  		do
! 			Result := a_feature.synonym (a_name)
  		ensure
  			synonym_not_void: Result /= Void
--- 2512,2516 ----
  			a_feature_not_void: a_feature /= Void
  		do
! 			Result := a_feature.new_synonym (a_name)
  		ensure
  			synonym_not_void: Result /= Void
***************
*** 2425,2438 ****
  		end
  
! 	new_tagged_expression_variant (a_variant: ET_TOKEN; a_tag: ET_IDENTIFIER;
! 		a_colon: ET_SYMBOL; an_expression: ET_EXPRESSION): ET_TAGGED_EXPRESSION_VARIANT is
  			-- New loop tagged expression variant
  		require
  			a_variant_not_void: a_variant /= Void
  			a_tag_not_void: a_tag /= Void
- 			a_colon_not_void: a_colon /= Void
  			an_expression_not_void: an_expression /= Void
  		do
! 			Result := ast_factory.new_tagged_expression_variant (a_variant, a_tag, a_colon, an_expression)
  		ensure
  			tagged_expression_variant_not_void: Result /= Void
--- 2544,2556 ----
  		end
  
! 	new_tagged_expression_variant (a_variant: ET_TOKEN; a_tag: ET_TAG;
! 		an_expression: ET_EXPRESSION): ET_TAGGED_EXPRESSION_VARIANT is
  			-- New loop tagged expression variant
  		require
  			a_variant_not_void: a_variant /= Void
  			a_tag_not_void: a_tag /= Void
  			an_expression_not_void: an_expression /= Void
  		do
! 			Result := ast_factory.new_tagged_expression_variant (a_variant, a_tag, an_expression)
  		ensure
  			tagged_expression_variant_not_void: Result /= Void
***************
*** 2497,2509 ****
  
  	new_unique_attribute (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE): ET_UNIQUE_ATTRIBUTE is
  			-- New unique attribute declaration
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
  		do
  			Result := universe.new_unique_attribute (a_name, a_type, last_clients, last_class)
  		ensure
  			unique_attribute_not_void: Result /= Void
--- 2615,2631 ----
  
  	new_unique_attribute (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_is, a_unique: ET_TOKEN): ET_UNIQUE_ATTRIBUTE is
  			-- New unique attribute declaration
  		require
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			an_is_not_void: an_is /= Void
+ 			a_unique_not_void: a_unique /= Void
  			last_clients_not_void: last_clients /= Void
  			has_last_class: has_last_class
  		do
  			Result := universe.new_unique_attribute (a_name, a_type, last_clients, last_class)
+ 			Result.set_is_keyword (an_is)
+ 			Result.set_unique_keyword (a_unique)
  		ensure
  			unique_attribute_not_void: Result /= Void

Index: et_eiffel_scanner.l
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/parser/et_eiffel_scanner.l,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** et_eiffel_scanner.l	12 Sep 2002 08:58:00 -0000	1.8
--- et_eiffel_scanner.l	22 Sep 2002 10:53:40 -0000	1.9
***************
*** 450,453 ****
--- 450,473 ----
  				last_value := new_token (text)
  			}
+ -- We need to make the distinction between once keywords followed
+ -- by a manifest string and once keywords introducing a once-routine
+ -- because otherwise we would need to have two look-ahead tokens
+ -- to figure out that the first once keyword in the following example
+ -- in part of a once manifest string expression and the second is
+ -- part of the compound of the once routine:
+ --   f is
+ --      require
+ --         once "foo" /= Void
+ --      once
+ --         do_nothing
+ --      end
+ once/([ \t\r\n]|"--".*\n)+\"	{
+ 				last_token := E_ONCE_STRING
+ 				last_value := new_token (once_keyword)
+ 			}
+ [oO][nN][cC][eE]/([ \t\r\n]|"--".*\n)+\"	{
+ 				last_token := E_ONCE_STRING
+ 				last_value := new_token (text)
+ 			}
  or			{
  				last_token := E_OR

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/type
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/type

Modified Files:
	et_actual_generic_parameters.e et_type.e et_type_comma.e 
	et_type_item.e 
Added Files:
	et_colon_type.e et_declared_type.e 
Log Message:
Continued decorating the abstract syntax tree.

--- NEW FILE: et_colon_type.e ---
indexing

	description:

		"Eiffel types preceded by a colon"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:39 $"
	revision: "$Revision: 1.1 $"

class ET_COLON_TYPE

inherit

	ET_DECLARED_TYPE

creation

	make

feature {NONE} -- Initialization

	make (a_colon: like colon; a_type: like declared_type) is
			-- Create a new colon-type.
		require
			a_colon_not_void: a_colon /= Void
			a_type_not_void: a_type /= Void
		do
			colon := a_colon
			declared_type := a_type
		ensure
			colon_set: colon = a_colon
			declared_type_set: declared_type = a_type
		end

feature -- Access

	declared_type: ET_TYPE
			-- Declared type

	colon: ET_SYMBOL
			-- Colon marker

	position: ET_POSITION is
			-- Position of first character of
			-- current node in source code
		do
			Result := colon.position
		end

	break: ET_BREAK is
			-- Break which appears just after current node
		do
			Result := declared_type.break
		end

feature -- Type processing

	resolved_formal_parameters (actual_parameters: ET_ACTUAL_GENERIC_PARAMETERS): ET_COLON_TYPE is
			-- Replace in current type the formal generic parameter
			-- types by those of `actual_parameters' when the 
			-- corresponding actual parameter is different from
			-- the formal parameter. (Warning: this is a side-effect
			-- function.)
		local
			a_type: ET_TYPE
		do
			a_type := declared_type.resolved_formal_parameters (actual_parameters)
			if a_type /= declared_type then
				!! Result.make (colon, a_type)
			else
				Result := Current
			end
		end

	resolved_identifier_types (a_feature: ET_FEATURE; args: ET_FORMAL_ARGUMENTS; a_class: ET_CLASS): ET_COLON_TYPE is
			-- Replace any 'like identifier' types that appear in the
			-- implementation of `a_feature in class `a_class' by
			-- the corresponding 'like feature' or 'like argument'.
			-- Also resolve 'BIT identifier' types. Set
			-- `a_class.has_flatten_error' to true if an error occurs.
			-- (Warning: this is a side-effect function.)
		local
			a_type: ET_TYPE
		do
			a_type := declared_type.resolved_identifier_types (a_feature, args, a_class)
			if a_type /= declared_type then
				!! Result.make (colon, a_type)
			else
				Result := Current
			end
		end

feature -- Duplication

	deep_cloned_type: like Current is
			-- Recursively cloned type
		local
			a_type: ET_TYPE
		do
			a_type := declared_type.deep_cloned_type
			if a_type /= declared_type then
				!! Result.make (colon, a_type)
			else
				Result := Current
			end
		end

invariant

	colon_not_void: colon /= Void

end

--- NEW FILE: et_declared_type.e ---
indexing

	description:

		"Eiffel entity declared types"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:39 $"
	revision: "$Revision: 1.1 $"

deferred class ET_DECLARED_TYPE

inherit

	ET_AST_NODE

feature -- Access

	declared_type: ET_TYPE is
			-- Declared type
		deferred
		ensure
			declared_type_not_void: Result /= Void
		end

feature -- Type processing

	resolved_formal_parameters (actual_parameters: ET_ACTUAL_GENERIC_PARAMETERS): ET_DECLARED_TYPE is
			-- Replace in current type the formal generic parameter
			-- types by those of `actual_parameters' when the 
			-- corresponding actual parameter is different from
			-- the formal parameter. (Warning: this is a side-effect
			-- function.)
		require
			actual_parameters_not_void: actual_parameters /= Void
		deferred
		ensure
			resolved_type_not_void: Result /= Void
		end

	resolved_identifier_types (a_feature: ET_FEATURE; args: ET_FORMAL_ARGUMENTS; a_class: ET_CLASS): ET_DECLARED_TYPE is
			-- Replace any 'like identifier' types that appear in the
			-- implementation of `a_feature in class `a_class' by
			-- the corresponding 'like feature' or 'like argument'.
			-- Also resolve 'BIT identifier' types. Set
			-- `a_class.has_flatten_error' to true if an error occurs.
			-- (Warning: this is a side-effect function.)
		require
			a_feature_not_void: a_feature /= Void
			a_class_not_void: a_class /= Void
			immediate_or_redeclared: a_feature.implementation_class = a_class
		deferred
		ensure
			resolved_type_not_void: Result /= Void
		end

feature -- Duplication

	deep_cloned_type: like Current is
			-- Recursively cloned type
		deferred
		ensure
			type_not_void: Result /= Void
		end

end

Index: et_actual_generic_parameters.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/type/et_actual_generic_parameters.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_actual_generic_parameters.e	6 Apr 2002 16:31:15 -0000	1.5
--- et_actual_generic_parameters.e	22 Sep 2002 10:53:39 -0000	1.6
***************
*** 76,80 ****
  			i_small_enough: i <= count
  		do
! 			Result := item (i).type_item
  		ensure
  			type_not_void: Result /= Void
--- 76,80 ----
  			i_small_enough: i <= count
  		do
! 			Result := item (i).type
  		ensure
  			type_not_void: Result /= Void

Index: et_type.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/type/et_type.e,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** et_type.e	27 Aug 2002 16:43:41 -0000	1.7
--- et_type.e	22 Sep 2002 10:53:39 -0000	1.8
***************
*** 20,29 ****
  		end
  
  	KL_IMPORTED_STRING_ROUTINES
  
  feature -- Access
  
! 	type_item: ET_TYPE is
  			-- Type in comma-separated list
  		do
  			Result := Current
--- 20,37 ----
  		end
  
+ 	ET_DECLARED_TYPE
+ 
  	KL_IMPORTED_STRING_ROUTINES
  
  feature -- Access
  
! 	type: ET_TYPE is
  			-- Type in comma-separated list
+ 		do
+ 			Result := Current
+ 		end
+ 
+ 	declared_type: ET_TYPE is
+ 			-- Declared type
  		do
  			Result := Current

Index: et_type_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/type/et_type_comma.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_type_comma.e	6 Apr 2002 16:31:15 -0000	1.3
--- et_type_comma.e	22 Sep 2002 10:53:39 -0000	1.4
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (a_type: like type_item; a_comma: like comma) is
  			-- Create a new type-comma.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_type: like type; a_comma: like comma) is
  			-- Create a new type-comma.
  		require
***************
*** 29,36 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			type_item := a_type
  			comma := a_comma
  		ensure
! 			type_item_set: type_item = a_type
  			comma_set: comma = a_comma
  		end
--- 29,36 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			type := a_type
  			comma := a_comma
  		ensure
! 			type_set: type = a_type
  			comma_set: comma = a_comma
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	type_item: ET_TYPE
  			-- Type in comma-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	type: ET_TYPE
  			-- Type in comma-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := type_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := type.position
  		end
  
***************
*** 68,73 ****
  			a_type: ET_TYPE
  		do
! 			a_type := type_item.resolved_formal_parameters (actual_parameters)
! 			if a_type /= type_item then
  				!! Result.make (a_type, comma)
  			else
--- 68,73 ----
  			a_type: ET_TYPE
  		do
! 			a_type := type.resolved_formal_parameters (actual_parameters)
! 			if a_type /= type then
  				!! Result.make (a_type, comma)
  			else
***************
*** 86,91 ****
  			a_type: ET_TYPE
  		do
! 			a_type := type_item.resolved_identifier_types (a_feature, args, a_class)
! 			if a_type /= type_item then
  				!! Result.make (a_type, comma)
  			else
--- 86,91 ----
  			a_type: ET_TYPE
  		do
! 			a_type := type.resolved_identifier_types (a_feature, args, a_class)
! 			if a_type /= type then
  				!! Result.make (a_type, comma)
  			else
***************
*** 103,108 ****
  			a_type: ET_TYPE
  		do
! 			a_type := type_item.resolved_named_types (a_class, ast_factory)
! 			if a_type /= type_item then
  				!! Result.make (a_type, comma)
  			else
--- 103,108 ----
  			a_type: ET_TYPE
  		do
! 			a_type := type.resolved_named_types (a_class, ast_factory)
! 			if a_type /= type then
  				!! Result.make (a_type, comma)
  			else
***************
*** 121,126 ****
  			a_base_type: ET_TYPE
  		do
! 			a_base_type := type_item.base_type (a_feature, a_type)
! 			if a_base_type /= type_item then
  				!! Result.make (a_base_type, comma)
  			else
--- 121,126 ----
  			a_base_type: ET_TYPE
  		do
! 			a_base_type := type.base_type (a_feature, a_type)
! 			if a_base_type /= type then
  				!! Result.make (a_base_type, comma)
  			else
***************
*** 136,141 ****
  			a_type: ET_TYPE
  		do
! 			a_type := type_item.deep_cloned_type
! 			if a_type /= type_item then
  				!! Result.make (a_type, comma)
  			else
--- 136,141 ----
  			a_type: ET_TYPE
  		do
! 			a_type := type.deep_cloned_type
! 			if a_type /= type then
  				!! Result.make (a_type, comma)
  			else

Index: et_type_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/type/et_type_item.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_type_item.e	6 Apr 2002 16:31:15 -0000	1.4
--- et_type_item.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 19,27 ****
  feature -- Access
  
! 	type_item: ET_TYPE is
  			-- Type in comma-separated list
  		deferred
  		ensure
! 			type_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	type: ET_TYPE is
  			-- Type in comma-separated list
  		deferred
  		ensure
! 			type_not_void: Result /= Void
  		end

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/name

Modified Files:
	et_argument_name.e et_class_name.e et_class_name_comma.e 
	et_class_name_item.e et_class_name_list.e et_feature_name.e 
	et_feature_name_comma.e et_feature_name_item.e 
	et_feature_name_list.e et_identifier.e et_identifier_colon.e 
	et_identifier_comma.e et_infix_name.e et_local_name.e et_tag.e 
Log Message:
Continued decorating the abstract syntax tree.

Index: et_argument_name.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_argument_name.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_argument_name.e	6 Apr 2002 16:30:46 -0000	1.3
--- et_argument_name.e	22 Sep 2002 10:53:39 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	identifier_item: ET_IDENTIFIER is
  			-- Identifier
  		deferred
  		ensure
! 			identifier_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	identifier: ET_IDENTIFIER is
  			-- Identifier
  		deferred
  		ensure
! 			identifier_not_void: Result /= Void
  		end
  

Index: et_class_name.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_class_name.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_class_name.e	6 Apr 2002 16:30:46 -0000	1.3
--- et_class_name.e	22 Sep 2002 10:53:39 -0000	1.4
***************
*** 28,32 ****
  		end
  
! 	class_name_item: ET_CLASS_NAME is
  			-- Class name in comma-separated list
  		do
--- 28,32 ----
  		end
  
! 	class_name: ET_CLASS_NAME is
  			-- Class name in comma-separated list
  		do

Index: et_class_name_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_class_name_comma.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_class_name_comma.e	6 Apr 2002 16:30:46 -0000	1.4
--- et_class_name_comma.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like class_name_item; a_comma: like comma) is
  			-- Create a new class_name-comma.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like class_name; a_comma: like comma) is
  			-- Create a new class_name-comma.
  		require
***************
*** 29,36 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			class_name_item := a_name
  			comma := a_comma
  		ensure
! 			class_name_item_set: class_name_item = a_name
  			comma_set: comma = a_comma
  		end
--- 29,36 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			class_name := a_name
  			comma := a_comma
  		ensure
! 			class_name_set: class_name = a_name
  			comma_set: comma = a_comma
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	class_name_item: ET_CLASS_NAME
  			-- Class name in comma-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	class_name: ET_CLASS_NAME
  			-- Class name in comma-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := class_name_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := class_name.position
  		end
  

Index: et_class_name_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_class_name_item.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_class_name_item.e	6 Apr 2002 16:30:46 -0000	1.3
--- et_class_name_item.e	22 Sep 2002 10:53:39 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	class_name_item: ET_CLASS_NAME is
  			-- Class name in comma-separated list
  		deferred
  		ensure
! 			class_name_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	class_name: ET_CLASS_NAME is
  			-- Class name in comma-separated list
  		deferred
  		ensure
! 			class_name_not_void: Result /= Void
  		end
  

Index: et_class_name_list.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_class_name_list.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_class_name_list.e	9 Apr 2002 11:06:38 -0000	1.5
--- et_class_name_list.e	22 Sep 2002 10:53:39 -0000	1.6
***************
*** 30,34 ****
  			i_small_enough: i <= count
  		do
! 			Result := item (i).class_name_item
  		ensure
  			class_name_not_void: Result /= Void
--- 30,34 ----
  			i_small_enough: i <= count
  		do
! 			Result := item (i).class_name
  		ensure
  			class_name_not_void: Result /= Void

Index: et_feature_name.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_feature_name.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_feature_name.e	6 Apr 2002 16:30:47 -0000	1.4
--- et_feature_name.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 28,32 ****
  		end
  
! 	feature_name_item: ET_FEATURE_NAME is
  			-- Feature name in comma-separated list
  		do
--- 28,32 ----
  		end
  
! 	feature_name: ET_FEATURE_NAME is
  			-- Feature name in comma-separated list
  		do

Index: et_feature_name_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_feature_name_comma.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_feature_name_comma.e	6 Apr 2002 16:30:47 -0000	1.4
--- et_feature_name_comma.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like feature_name_item; a_comma: like comma) is
  			-- Create a new feature_name-comma.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like feature_name; a_comma: like comma) is
  			-- Create a new feature_name-comma.
  		require
***************
*** 29,36 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			feature_name_item := a_name
  			comma := a_comma
  		ensure
! 			feature_name_item_set: feature_name_item = a_name
  			comma_set: comma = a_comma
  		end
--- 29,36 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			feature_name := a_name
  			comma := a_comma
  		ensure
! 			feature_name_set: feature_name = a_name
  			comma_set: comma = a_comma
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	feature_name_item: ET_FEATURE_NAME
  			-- Feature name in comma-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	feature_name: ET_FEATURE_NAME
  			-- Feature name in comma-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := feature_name_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := feature_name.position
  		end
  

Index: et_feature_name_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_feature_name_item.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_feature_name_item.e	6 Apr 2002 16:30:47 -0000	1.4
--- et_feature_name_item.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 19,27 ****
  feature -- Access
  
! 	feature_name_item: ET_FEATURE_NAME is
  			-- Feature name in comma-separated list
  		deferred
  		ensure
! 			feature_name_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	feature_name: ET_FEATURE_NAME is
  			-- Feature name in comma-separated list
  		deferred
  		ensure
! 			feature_name_not_void: Result /= Void
  		end
  

Index: et_feature_name_list.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_feature_name_list.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_feature_name_list.e	6 Apr 2002 16:30:47 -0000	1.4
--- et_feature_name_list.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 27,31 ****
  			i_small_enough: i <= count
  		do
! 			Result := item (i).feature_name_item
  		ensure
  			feature_name_not_void: Result /= Void
--- 27,31 ----
  			i_small_enough: i <= count
  		do
! 			Result := item (i).feature_name
  		ensure
  			feature_name_not_void: Result /= Void

Index: et_identifier.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_identifier.e,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** et_identifier.e	12 Sep 2002 08:58:00 -0000	1.8
--- et_identifier.e	22 Sep 2002 10:53:39 -0000	1.9
***************
*** 74,78 ****
  		end
  
! 	identifier_item: ET_IDENTIFIER is
  			-- Identifier
  		do
--- 74,78 ----
  		end
  
! 	identifier: ET_IDENTIFIER is
  			-- Identifier
  		do

Index: et_identifier_colon.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_identifier_colon.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_identifier_colon.e	6 Apr 2002 16:30:47 -0000	1.4
--- et_identifier_colon.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 15,20 ****
  inherit
  
- 	ET_LOCAL_NAME
- 	ET_ARGUMENT_NAME
  	ET_TAG
  
--- 15,18 ----
***************
*** 25,29 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like identifier_item; a_colon: like colon) is
  			-- Create a new identifier-colon.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like identifier; a_colon: like colon) is
  			-- Create a new identifier-colon.
  		require
***************
*** 31,38 ****
  			a_colon_not_void: a_colon /= Void
  		do
! 			identifier_item := a_name
  			colon := a_colon
  		ensure
! 			identifier_item_set: identifier_item = a_name
  			colon_set: colon = a_colon
  		end
--- 29,36 ----
  			a_colon_not_void: a_colon /= Void
  		do
! 			identifier := a_name
  			colon := a_colon
  		ensure
! 			identifier_set: identifier = a_name
  			colon_set: colon = a_colon
  		end
***************
*** 40,44 ****
  feature -- Access
  
! 	identifier_item: ET_IDENTIFIER
  			-- Identifier
  
--- 38,42 ----
  feature -- Access
  
! 	identifier: ET_IDENTIFIER
  			-- Identifier
  
***************
*** 50,54 ****
  			-- current node in source code
  		do
! 			Result := identifier_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := identifier.position
  		end
  

Index: et_identifier_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_identifier_comma.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_identifier_comma.e	6 Apr 2002 16:30:47 -0000	1.4
--- et_identifier_comma.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 24,28 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like identifier_item; a_comma: like comma) is
  			-- Create a new identifier-comma.
  		require
--- 24,28 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like identifier; a_comma: like comma) is
  			-- Create a new identifier-comma.
  		require
***************
*** 30,37 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			identifier_item := a_name
  			comma := a_comma
  		ensure
! 			identifier_item_set: identifier_item = a_name
  			comma_set: comma = a_comma
  		end
--- 30,37 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			identifier := a_name
  			comma := a_comma
  		ensure
! 			identifier_set: identifier = a_name
  			comma_set: comma = a_comma
  		end
***************
*** 39,43 ****
  feature -- Access
  
! 	identifier_item: ET_IDENTIFIER
  			-- Identifier
  
--- 39,43 ----
  feature -- Access
  
! 	identifier: ET_IDENTIFIER
  			-- Identifier
  
***************
*** 49,53 ****
  			-- current node in source code
  		do
! 			Result := identifier_item.position
  		end
  
--- 49,53 ----
  			-- current node in source code
  		do
! 			Result := identifier.position
  		end
  

Index: et_infix_name.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_infix_name.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_infix_name.e	6 Apr 2002 16:30:47 -0000	1.4
--- et_infix_name.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 38,42 ****
  
  	operator_name: ET_MANIFEST_STRING
! 			-- Name of prefix operator
  
  	position: ET_POSITION is
--- 38,42 ----
  
  	operator_name: ET_MANIFEST_STRING
! 			-- Name of infix operator
  
  	position: ET_POSITION is

Index: et_local_name.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_local_name.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_local_name.e	6 Apr 2002 16:30:47 -0000	1.3
--- et_local_name.e	22 Sep 2002 10:53:39 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	identifier_item: ET_IDENTIFIER is
  			-- Identifier
  		deferred
  		ensure
! 			identifier_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	identifier: ET_IDENTIFIER is
  			-- Identifier
  		deferred
  		ensure
! 			identifier_not_void: Result /= Void
  		end
  

Index: et_tag.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/name/et_tag.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_tag.e	6 Apr 2002 16:30:47 -0000	1.3
--- et_tag.e	22 Sep 2002 10:53:39 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	identifier_item: ET_IDENTIFIER is
  			-- Identifier
  		deferred
  		ensure
! 			identifier_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	identifier: ET_IDENTIFIER is
  			-- Identifier
  		deferred
  		ensure
! 			identifier_not_void: Result /= Void
  		end

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/misc
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/misc

Modified Files:
	et_token_constants.e 
Log Message:
Continued decorating the abstract syntax tree.

Index: et_token_constants.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/misc/et_token_constants.e,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** et_token_constants.e	12 Sep 2002 08:58:00 -0000	1.8
--- et_token_constants.e	22 Sep 2002 10:53:39 -0000	1.9
***************
*** 65,68 ****
--- 65,76 ----
  		end
  
+ 	deferred_keyword: ET_DEFERRED_KEYWORD is
+ 			-- 'deferred' keyword
+ 		once
+ 			!! Result.make (deferred_keyword_name)
+ 		ensure
+ 			keyword_not_void: Result /= Void
+ 		end
+ 
  	end_keyword: ET_TOKEN is
  			-- 'end' keyword
***************
*** 81,84 ****
--- 89,100 ----
  		end
  
+ 	feature_keyword: ET_TOKEN is
+ 			-- 'feature' keyword
+ 		once
+ 			!! Result.make (feature_keyword_name)
+ 		ensure
+ 			keyword_not_void: Result /= Void
+ 		end
+ 
  	indexing_keyword: ET_TOKEN is
  			-- 'indexing' keyword
***************
*** 97,100 ****
--- 113,124 ----
  		end
  
+ 	is_keyword: ET_TOKEN is
+ 			-- 'is' keyword
+ 		once
+ 			!! Result.make (is_keyword_name)
+ 		ensure
+ 			keyword_not_void: Result /= Void
+ 		end
+ 
  	local_keyword: ET_TOKEN is
  			-- 'local' keyword
***************
*** 117,120 ****
--- 141,152 ----
  		once
  			!! Result.make (strip_keyword_name)
+ 		ensure
+ 			keyword_not_void: Result /= Void
+ 		end
+ 
+ 	unique_keyword: ET_TOKEN is
+ 			-- 'unique' keyword
+ 		once
+ 			!! Result.make (unique_keyword_name)
  		ensure
  			keyword_not_void: Result /= Void

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/lace
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/lace

Modified Files:
	et_cluster.e et_universe.e 
Log Message:
Continued decorating the abstract syntax tree.

Index: et_cluster.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/lace/et_cluster.e,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** et_cluster.e	24 Jul 2002 14:46:49 -0000	1.13
--- et_cluster.e	22 Sep 2002 10:53:39 -0000	1.14
***************
*** 16,19 ****
--- 16,20 ----
  
  	KL_SHARED_EXECUTION_ENVIRONMENT
+ 	KL_SHARED_STANDARD_FILES
  	KL_IMPORTED_STRING_ROUTINES
  
***************
*** 392,395 ****
--- 393,401 ----
  			a_cluster: ET_CLUSTER
  		do
+ 			debug ("GELINT")
+ 				std.error.put_string ("Parse cluster '")
+ 				std.error.put_string (full_pathname)
+ 				std.error.put_line ("%'")
+ 			end
  			if not is_abstract then
  				dir_name := Execution_environment.interpreted_string (full_pathname)

Index: et_universe.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/lace/et_universe.e,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** et_universe.e	18 Apr 2002 17:48:26 -0000	1.13
--- et_universe.e	22 Sep 2002 10:53:39 -0000	1.14
***************
*** 182,186 ****
  feature -- Factory
  
! 	new_attribute (a_name: ET_FEATURE_NAME; a_type: ET_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS): ET_ATTRIBUTE is
  			-- New attribute feature for `a_class'
--- 182,186 ----
  feature -- Factory
  
! 	new_attribute (a_name: ET_FEATURE_NAME_ITEM; a_type: ET_DECLARED_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS): ET_ATTRIBUTE is
  			-- New attribute feature for `a_class'
***************
*** 200,204 ****
  		end
  
! 	new_constant_attribute (a_name: ET_FEATURE_NAME; a_type: ET_TYPE; a_constant: ET_CONSTANT;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS): ET_CONSTANT_ATTRIBUTE is
  			-- New constant attribute feature for `a_class'
--- 200,204 ----
  		end
  
! 	new_constant_attribute (a_name: ET_FEATURE_NAME_ITEM; a_type: ET_DECLARED_TYPE; a_constant: ET_CONSTANT;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS): ET_CONSTANT_ATTRIBUTE is
  			-- New constant attribute feature for `a_class'
***************
*** 219,224 ****
  		end
  
! 	new_deferred_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS): ET_DEFERRED_FUNCTION is
--- 219,224 ----
  		end
  
! 	new_deferred_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS): ET_DEFERRED_FUNCTION is
***************
*** 240,244 ****
  		end
  
! 	new_deferred_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
--- 240,244 ----
  		end
  
! 	new_deferred_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
***************
*** 260,265 ****
  		end
  
! 	new_do_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_TYPE;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
  		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND;
--- 260,265 ----
  		end
  
! 	new_do_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
  		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND;
***************
*** 269,272 ****
--- 269,273 ----
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 282,286 ****
  		end
  
! 	new_do_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
--- 283,287 ----
  		end
  
! 	new_do_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
***************
*** 290,293 ****
--- 291,295 ----
  		require
  			a_name_not_void: a_name /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 303,309 ****
  		end
  
! 	new_external_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_MANIFEST_STRING; an_alias: ET_MANIFEST_STRING;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS): ET_EXTERNAL_FUNCTION is
--- 305,311 ----
  		end
  
! 	new_external_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_EXTERNAL_LANGUAGE; an_alias: ET_EXTERNAL_ALIAS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS): ET_EXTERNAL_FUNCTION is
***************
*** 327,333 ****
  		end
  
! 	new_external_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_MANIFEST_STRING; an_alias: ET_MANIFEST_STRING;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS): ET_EXTERNAL_PROCEDURE is
--- 329,335 ----
  		end
  
! 	new_external_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
! 		a_language: ET_EXTERNAL_LANGUAGE; an_alias: ET_EXTERNAL_ALIAS;
  		a_postconditions: ET_POSTCONDITIONS; a_clients: ET_CLASS_NAME_LIST;
  		a_class: ET_CLASS): ET_EXTERNAL_PROCEDURE is
***************
*** 350,355 ****
  		end
  
! 	new_once_function (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS; a_type: ET_TYPE;
! 		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
  		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND;
--- 352,357 ----
  		end
  
! 	new_once_function (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
! 		a_type: ET_DECLARED_TYPE; an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
  		a_postconditions: ET_POSTCONDITIONS; a_rescue: ET_COMPOUND;
***************
*** 359,362 ****
--- 361,365 ----
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 372,376 ****
  		end
  
! 	new_once_procedure (a_name: ET_FEATURE_NAME; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
--- 375,379 ----
  		end
  
! 	new_once_procedure (a_name: ET_FEATURE_NAME_ITEM; args: ET_FORMAL_ARGUMENTS;
  		an_obsolete: ET_OBSOLETE; a_preconditions: ET_PRECONDITIONS;
  		a_locals: ET_LOCAL_VARIABLES; a_compound: ET_COMPOUND;
***************
*** 380,383 ****
--- 383,387 ----
  		require
  			a_name_not_void: a_name /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
***************
*** 393,397 ****
  		end
  
! 	new_unique_attribute (a_name: ET_FEATURE_NAME; a_type: ET_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS): ET_UNIQUE_ATTRIBUTE is
  			-- New unique attribute declaration for `a_class'
--- 397,401 ----
  		end
  
! 	new_unique_attribute (a_name: ET_FEATURE_NAME_ITEM; a_type: ET_DECLARED_TYPE;
  		a_clients: ET_CLASS_NAME_LIST; a_class: ET_CLASS): ET_UNIQUE_ATTRIBUTE is
  			-- New unique attribute declaration for `a_class'

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/feature

Modified Files:
	et_attribute.e et_constant_attribute.e et_deferred_function.e 
	et_deferred_procedure.e et_deferred_routine.e et_do_function.e 
	et_do_procedure.e et_external_function.e 
	et_external_procedure.e et_external_routine.e et_feature.e 
	et_formal_argument.e et_formal_arguments.e et_function.e 
	et_internal_function.e et_internal_procedure.e 
	et_internal_routine.e et_local_variable.e et_once_function.e 
	et_once_procedure.e et_procedure.e et_query.e et_routine.e 
	et_unique_attribute.e 
Added Files:
	et_external_alias.e et_external_language.e et_feature_item.e 
	et_feature_semicolon.e 
Log Message:
Continued decorating the abstract syntax tree.

--- NEW FILE: et_external_alias.e ---
indexing

	description:

		"Eiffel alias clauses in external routines"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:38 $"
	revision: "$Revision: 1.1 $"

deferred class ET_EXTERNAL_ALIAS

inherit

	ET_AST_NODE

feature -- Access

	manifest_string: ET_MANIFEST_STRING is
			-- Manifest string
		deferred
		ensure
			manifest_string_not_void: Result /= Void
		end

end

--- NEW FILE: et_external_language.e ---
indexing

	description:

		"Eiffel language clauses in external routines"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:38 $"
	revision: "$Revision: 1.1 $"

deferred class ET_EXTERNAL_LANGUAGE

inherit

	ET_AST_NODE

feature -- Access

	manifest_string: ET_MANIFEST_STRING is
			-- Manifest string
		deferred
		ensure
			manifest_string_not_void: Result /= Void
		end

end

--- NEW FILE: et_feature_item.e ---
indexing

	description:

		"Eiffel features in semicolon-separated list of features"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:38 $"
	revision: "$Revision: 1.1 $"

deferred class ET_FEATURE_ITEM

inherit

	ET_AST_NODE

feature -- Access

	feature_item: ET_FEATURE is
			-- Feature in semicolon-separated list
		deferred
		ensure
			feature_item_not_void: Result /= Void
		end

end

--- NEW FILE: et_feature_semicolon.e ---
indexing

	description:

		"Eiffel features followed by a semicolon"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:38 $"
	revision: "$Revision: 1.1 $"

class ET_FEATURE_SEMICOLON

inherit

	ET_FEATURE_ITEM

creation

	make

feature {NONE} -- Initialization

	make (a_feature: like feature_item; a_semicolon: like semicolon) is
			-- Create a new feature-semicolon.
		require
			a_feature_not_void: a_feature /= Void
			a_semicolon_not_void: a_semicolon /= Void
		do
			feature_item := a_feature
			semicolon := a_semicolon
		ensure
			feature_item_set: feature_item = a_feature
			semicolon_set: semicolon = a_semicolon
		end

feature -- Access

	feature_item: ET_FEATURE
			-- Feature in semicolon-separated list

	semicolon: ET_SYMBOL
			-- Semicolon separator

	position: ET_POSITION is
			-- Position of first character of
			-- current node in source code
		do
			Result := feature_item.position
		end

	break: ET_BREAK is
			-- Break which appears just after current node
		do
			Result := semicolon.break
		end

invariant

	semicolon_not_void: semicolon /= Void

end

Index: et_attribute.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_attribute.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_attribute.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_attribute.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 27,31 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; a_type: like type; a_clients: like clients;
  		a_class: like current_class; an_id: INTEGER) is
  			-- Create a new attribute.
--- 27,31 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; a_type: like declared_type; a_clients: like clients;
  		a_class: like current_class; an_id: INTEGER) is
  			-- Create a new attribute.
***************
*** 37,43 ****
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
! 			type := a_type
  			clients := a_clients
  			version := an_id
--- 37,43 ----
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
! 			declared_type := a_type
  			clients := a_clients
  			version := an_id
***************
*** 46,51 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
! 			type_set: type = a_type
  			clients_set: clients = a_clients
  			version_set: version = an_id
--- 46,51 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
! 			declared_type_set: declared_type = a_type
  			clients_set: clients = a_clients
  			version_set: version = an_id
***************
*** 65,74 ****
  			-- the form 'prefix ...'?
  
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
! 			Result := universe.new_attribute (a_name, type, clients, current_class)
  		end
  
--- 65,83 ----
  			-- the form 'prefix ...'?
  
+ feature -- Access
+ 
+ 	break: ET_BREAK is
+ 			-- Break which appears just after current node
+ 		do
+ 			-- TODO:
+ 		end
+ 
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
! 			Result := universe.new_attribute (a_name, declared_type, clients, current_class)
! 			Result.set_synonym (Current)
  		end
  
***************
*** 78,84 ****
  			-- Renamed version of current feature
  		do
! 			Result := universe.new_attribute (a_name, type, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
--- 87,94 ----
  			-- Renamed version of current feature
  		do
! 			Result := universe.new_attribute (a_name, declared_type, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_constant_attribute.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_constant_attribute.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_constant_attribute.e	6 Apr 2002 16:29:28 -0000	1.5
--- et_constant_attribute.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 21,24 ****
--- 21,26 ----
  		end
  
+ 	ET_SHARED_TOKEN_CONSTANTS
+ 
  creation
  
***************
*** 27,31 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; a_type: like type; a_constant: like constant;
  		a_clients: like clients; a_class: like current_class; an_id: INTEGER) is
  			-- Create a new constant attribute.
--- 29,33 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; a_type: like declared_type; a_constant: like constant;
  		a_clients: like clients; a_class: like current_class; an_id: INTEGER) is
  			-- Create a new constant attribute.
***************
*** 38,44 ****
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
! 			type := a_type
  			constant := a_constant
  			clients := a_clients
--- 40,47 ----
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
! 			declared_type := a_type
! 			is_keyword := tokens.is_keyword
  			constant := a_constant
  			clients := a_clients
***************
*** 48,53 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
! 			type_set: type = a_type
  			constant_set: constant = a_constant
  			clients_set: clients = a_clients
--- 51,56 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
! 			declared_type_set: declared_type = a_type
  			constant_set: constant = a_constant
  			clients_set: clients = a_clients
***************
*** 61,67 ****
--- 64,79 ----
  feature -- Access
  
+ 	is_keyword: ET_TOKEN
+ 			-- 'is' keyword
+ 
  	constant: ET_CONSTANT
  			-- Constant value
  
+ 	break: ET_BREAK is
+ 			-- Break which appears just after current node
+ 		do
+ 			Result := constant.break
+ 		end
+ 
  feature -- Status report
  
***************
*** 73,83 ****
  			-- the form 'prefix ...'?
  
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_constant_attribute (a_name,
! 				type, constant, clients, current_class)
  		end
  
--- 85,109 ----
  			-- the form 'prefix ...'?
  
+ feature -- Setting
+ 
+ 	set_is_keyword (an_is: like is_keyword) is
+ 			-- Set `is_keyword' to `an_is'.
+ 		require
+ 			an_is_not_void: an_is /= Void
+ 		do
+ 			is_keyword := an_is
+ 		ensure
+ 			is_keyword_set: is_keyword = an_is
+ 		end
+ 
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_constant_attribute (a_name,
! 				declared_type, constant, clients, current_class)
! 			Result.set_is_keyword (is_keyword)
! 			Result.set_synonym (Current)
  		end
  
***************
*** 88,94 ****
  		do
  			Result := universe.new_constant_attribute (a_name,
! 				type, constant, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
--- 114,122 ----
  		do
  			Result := universe.new_constant_attribute (a_name,
! 				declared_type, constant, clients, current_class)
! 			Result.set_is_keyword (is_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
***************
*** 105,108 ****
--- 133,137 ----
  invariant
  
+ 	is_keyword_not_void: is_keyword /= Void
  	constant_not_void: constant /= Void
  

Index: et_deferred_function.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_deferred_function.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_deferred_function.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_deferred_function.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 31,35 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; args: like arguments; a_type: like type;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_postconditions: like postconditions; a_clients: like clients;
--- 31,35 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; args: like arguments; a_type: like declared_type;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_postconditions: like postconditions; a_clients: like clients;
***************
*** 43,53 ****
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
  			arguments := args
! 			type := a_type
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
  			postconditions := a_postconditions
  			clients := a_clients
  			version := an_id
--- 43,56 ----
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
  			arguments := args
! 			declared_type := a_type
! 			is_keyword := tokens.is_keyword
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
+ 			deferred_keyword := tokens.deferred_keyword
  			postconditions := a_postconditions
+ 			end_keyword := tokens.end_keyword
  			clients := a_clients
  			version := an_id
***************
*** 56,62 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
  			arguments_set: arguments = args
! 			type_set: type = a_type
  			obsolete_message_set: obsolete_message = an_obsolete
  			preconditions_set: preconditions = a_preconditions
--- 59,65 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
  			arguments_set: arguments = args
! 			declared_type_set: declared_type = a_type
  			obsolete_message_set: obsolete_message = an_obsolete
  			preconditions_set: preconditions = a_preconditions
***************
*** 72,81 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_deferred_function (a_name,
! 				arguments, type, obsolete_message, preconditions,
  				postconditions, clients, current_class)
  		end
  
--- 75,88 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_deferred_function (a_name,
! 				arguments, declared_type, obsolete_message, preconditions,
  				postconditions, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_deferred_keyword (deferred_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 86,93 ****
  		do
  			Result := universe.new_deferred_function (a_name,
! 				arguments, type, obsolete_message, preconditions,
  				postconditions, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
--- 93,104 ----
  		do
  			Result := universe.new_deferred_function (a_name,
! 				arguments, declared_type, obsolete_message, preconditions,
  				postconditions, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_deferred_keyword (deferred_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_deferred_procedure.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_deferred_procedure.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_deferred_procedure.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_deferred_procedure.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 28,32 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; args: like arguments; an_obsolete: like obsolete_message;
  		a_preconditions: like preconditions; a_postconditions: like postconditions;
  		a_clients: like clients; a_class: like current_class; an_id: INTEGER) is
--- 28,32 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; args: like arguments; an_obsolete: like obsolete_message;
  		a_preconditions: like preconditions; a_postconditions: like postconditions;
  		a_clients: like clients; a_class: like current_class; an_id: INTEGER) is
***************
*** 38,47 ****
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
  			arguments := args
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
  			postconditions := a_postconditions
  			clients := a_clients
  			version := an_id
--- 38,50 ----
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
  			arguments := args
+ 			is_keyword := tokens.is_keyword
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
+ 			deferred_keyword := tokens.deferred_keyword
  			postconditions := a_postconditions
+ 			end_keyword := tokens.end_keyword
  			clients := a_clients
  			version := an_id
***************
*** 50,54 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
  			arguments_set: arguments = args
  			obsolete_message_set: obsolete_message = an_obsolete
--- 53,57 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
  			arguments_set: arguments = args
  			obsolete_message_set: obsolete_message = an_obsolete
***************
*** 65,69 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
--- 68,72 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
***************
*** 71,74 ****
--- 74,81 ----
  				arguments, obsolete_message, preconditions, postconditions,
  				clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_deferred_keyword (deferred_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 81,86 ****
--- 88,97 ----
  				arguments, obsolete_message, preconditions, postconditions,
  				clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_deferred_keyword (deferred_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_deferred_routine.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_deferred_routine.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_deferred_routine.e	6 Apr 2002 16:29:28 -0000	1.3
--- et_deferred_routine.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 25,27 ****
--- 25,48 ----
  			-- Is feature deferred?
  
+ feature -- Access
+ 
+ 	deferred_keyword: ET_DEFERRED_KEYWORD
+ 			-- 'deferred' keyword
+ 
+ feature -- Setting
+ 
+ 	set_deferred_keyword (a_deferred: like deferred_keyword) is
+ 			-- Set `deferred_keyword' to `a_deferred'.
+ 		require
+ 			a_deferred_not_void: a_deferred /= Void
+ 		do
+ 			deferred_keyword := a_deferred
+ 		ensure
+ 			deferred_keyword_set: deferred_keyword = a_deferred
+ 		end
+ 
+ invariant
+ 
+ 	deferred_keyword_not_void: deferred_keyword /= Void
+ 
  end

Index: et_do_function.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_do_function.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_do_function.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_do_function.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 23,32 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_do_function (a_name,
! 				arguments, type, obsolete_message, preconditions, locals,
  				compound, postconditions, rescue_clause, clients, current_class)
  		end
  
--- 23,35 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_do_function (a_name,
! 				arguments, declared_type, obsolete_message, preconditions, locals,
  				compound, postconditions, rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 37,44 ****
  		do
  			Result := universe.new_do_function (a_name,
! 				arguments, type, obsolete_message, preconditions, locals,
  				compound, postconditions, rescue_clause, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
--- 40,50 ----
  		do
  			Result := universe.new_do_function (a_name,
! 				arguments, declared_type, obsolete_message, preconditions, locals,
  				compound, postconditions, rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_do_procedure.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_do_procedure.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_do_procedure.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_do_procedure.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 23,27 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
--- 23,27 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
***************
*** 29,32 ****
--- 29,35 ----
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 39,44 ****
--- 42,50 ----
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_external_function.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_external_function.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_external_function.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_external_function.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 28,32 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; args: like arguments; a_type: like type;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_language: like language; an_alias: like alias_clause;
--- 28,32 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; args: like arguments; a_type: like declared_type;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_language: like language; an_alias: like alias_clause;
***************
*** 42,49 ****
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
  			arguments := args
! 			type := a_type
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
--- 42,50 ----
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
  			arguments := args
! 			declared_type := a_type
! 			is_keyword := tokens.is_keyword
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
***************
*** 51,54 ****
--- 52,56 ----
  			alias_clause := an_alias
  			postconditions := a_postconditions
+ 			end_keyword := tokens.end_keyword
  			clients := a_clients
  			version := an_id
***************
*** 57,63 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
  			arguments_set: arguments = args
! 			type_set: type = a_type
  			obsolete_message_set: obsolete_message = an_obsolete
  			preconditions_set: preconditions = a_preconditions
--- 59,65 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
  			arguments_set: arguments = args
! 			declared_type_set: declared_type = a_type
  			obsolete_message_set: obsolete_message = an_obsolete
  			preconditions_set: preconditions = a_preconditions
***************
*** 75,84 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_external_function (a_name, arguments,
! 				type, obsolete_message, preconditions, language, alias_clause,
  				postconditions, clients, current_class)
  		end
  
--- 77,89 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_external_function (a_name, arguments,
! 				declared_type, obsolete_message, preconditions, language, alias_clause,
  				postconditions, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 89,96 ****
  		do
  			Result := universe.new_external_function (a_name, arguments,
! 				type, obsolete_message, preconditions, language, alias_clause,
! 				postconditions, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
--- 94,104 ----
  		do
  			Result := universe.new_external_function (a_name, arguments,
! 				declared_type, obsolete_message, preconditions, language,
! 				alias_clause, postconditions, clients, current_class)
! 			Result.set_is_keyword (is_keyword)
! 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_external_procedure.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_external_procedure.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_external_procedure.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_external_procedure.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 24,28 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; args: like arguments;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_language: like language; an_alias: like alias_clause;
--- 24,28 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; args: like arguments;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_language: like language; an_alias: like alias_clause;
***************
*** 36,43 ****
  			a_class_not_void: a_class /= Void
  			an_id_positive: an_id > 0
! 		do	
! 			name := a_name
  			id := an_id
  			arguments := args
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
--- 36,44 ----
  			a_class_not_void: a_class /= Void
  			an_id_positive: an_id > 0
! 		do
! 			name_item := a_name
  			id := an_id
  			arguments := args
+ 			is_keyword := tokens.is_keyword
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
***************
*** 45,48 ****
--- 46,50 ----
  			alias_clause := an_alias
  			postconditions := a_postconditions
+ 			end_keyword := tokens.end_keyword
  			clients := a_clients
  			version := an_id
***************
*** 51,55 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
  			arguments_set: arguments = args
  			obsolete_message_set: obsolete_message = an_obsolete
--- 53,57 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
  			arguments_set: arguments = args
  			obsolete_message_set: obsolete_message = an_obsolete
***************
*** 68,72 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
--- 70,74 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
***************
*** 74,77 ****
--- 76,82 ----
  				arguments, obsolete_message, preconditions, language,
  				alias_clause, postconditions, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 84,89 ****
--- 89,97 ----
  				arguments, obsolete_message, preconditions, language,
  				alias_clause, postconditions, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_external_routine.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_external_routine.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_external_routine.e	6 Apr 2002 16:29:28 -0000	1.3
--- et_external_routine.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 19,26 ****
  feature -- Access
  
! 	language: ET_MANIFEST_STRING
  			-- External language
  
! 	alias_clause: ET_MANIFEST_STRING
  			-- Alias clause
  
--- 19,26 ----
  feature -- Access
  
! 	language: ET_EXTERNAL_LANGUAGE
  			-- External language
  
! 	alias_clause: ET_EXTERNAL_ALIAS
  			-- Alias clause
  

Index: et_feature.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_feature.e,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** et_feature.e	9 Apr 2002 11:07:23 -0000	1.7
--- et_feature.e	22 Sep 2002 10:53:38 -0000	1.8
***************
*** 15,24 ****
  inherit
  
  	HASHABLE
  
  feature -- Access
  
! 	name: ET_FEATURE_NAME
  			-- Feature name
  
  	current_class: ET_CLASS
--- 15,31 ----
  inherit
  
+ 	ET_FEATURE_ITEM
+ 
  	HASHABLE
  
  feature -- Access
  
! 	name: ET_FEATURE_NAME is
  			-- Feature name
+ 		do
+ 			Result := name_item.feature_name
+ 		ensure
+ 			name_not_void: Result /= Void
+ 		end
  
  	current_class: ET_CLASS
***************
*** 99,106 ****
  		end
  
  feature -- Status report
  
! 	is_frozen: BOOLEAN
  			-- Has feature been declared as frozen?
  
  	is_deferred: BOOLEAN is
--- 106,143 ----
  		end
  
+ 	name_item: ET_FEATURE_NAME_ITEM
+ 			-- Feature name (possibly followed by comma for synomyms)
+ 
+ 	frozen_keyword: ET_TOKEN
+ 			-- 'frozen' keyword
+ 
+ 	synonym: ET_FEATURE
+ 			-- Next synonym if any
+ 
+ 	position: ET_POSITION is
+ 			-- Position of first character of
+ 			-- current node in source code
+ 		do
+ 			if not is_frozen then
+ 				Result := name.position
+ 			else
+ 				-- TODO:
+ 				Result := name.position
+ 			end
+ 		end
+ 
+ 	feature_item: ET_FEATURE is
+ 			-- Feature in semicolon-separated list
+ 		do
+ 			Result := Current
+ 		end
+ 
  feature -- Status report
  
! 	is_frozen: BOOLEAN is
  			-- Has feature been declared as frozen?
+ 		do
+ 			Result := (frozen_keyword /= Void)
+ 		end
  
  	is_deferred: BOOLEAN is
***************
*** 285,301 ****
  		end
  
! feature -- Status setting
  
! 	set_frozen is
! 			-- Set `is_frozen' to true.
  		do
! 			is_frozen := True
  		ensure
! 			is_frozen: is_frozen
  		end
  
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		require
--- 322,344 ----
  		end
  
! 	set_frozen_keyword (a_frozen: like frozen_keyword) is
! 			-- Set `frozen_keyword' to `a_frozen'.
! 		do
! 			frozen_keyword := a_frozen
! 		ensure
! 			frozen_keyword_set: frozen_keyword = a_frozen
! 		end
  
! 	set_synonym (a_synonym: like synonym) is
! 			-- Set `synonym' to `a_synonym'.
  		do
! 			synonym := a_synonym
  		ensure
! 			synonym_set: a_synonym = a_synonym
  		end
  
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		require
***************
*** 303,308 ****
  		deferred
  		ensure
! 			synonym_not_void: Result /= Void
! 			name_set: Result.name = a_name
  		end
  
--- 346,351 ----
  		deferred
  		ensure
! 			new_synonym_not_void: Result /= Void
! 			name_item_set: Result.name_item = a_name
  		end
  
***************
*** 375,379 ****
  invariant
  
! 	name_not_void: name /= Void
  	id_positive: id > 0
  	current_class_not_void: current_class /= Void
--- 418,422 ----
  invariant
  
! 	name_item_not_void: name_item /= Void
  	id_positive: id > 0
  	current_class_not_void: current_class /= Void

Index: et_formal_argument.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_formal_argument.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_formal_argument.e	6 Apr 2002 16:29:28 -0000	1.5
--- et_formal_argument.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 19,23 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; a_type: like type) is
  			-- Create a new formal argument.
  		require
--- 19,23 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; a_type: like declared_type) is
  			-- Create a new formal argument.
  		require
***************
*** 26,33 ****
  		do
  			name_item := a_name
! 			type := a_type
  		ensure
  			name_item_set: name_item = a_name
! 			type_set: type = a_type
  		end
  
--- 26,33 ----
  		do
  			name_item := a_name
! 			declared_type := a_type
  		ensure
  			name_item_set: name_item = a_name
! 			declared_type_set: declared_type = a_type
  		end
  
***************
*** 37,51 ****
  			-- Name
  		do
! 			Result := name_item.identifier_item
  		ensure
  			name_not_void: Result /= Void
  		end
  
! 	type: ET_TYPE
  			-- Type
  
  	name_item: ET_ARGUMENT_NAME
  			-- Name follow by a comma or semicolon
  
  	formal_argument_item: ET_FORMAL_ARGUMENT is
  			-- Formal argument in semicolon-separated list
--- 37,57 ----
  			-- Name
  		do
! 			Result := name_item.identifier
  		ensure
  			name_not_void: Result /= Void
  		end
  
! 	type: ET_TYPE is
  			-- Type
+ 		do
+ 			Result := declared_type.declared_type
+ 		end
  
  	name_item: ET_ARGUMENT_NAME
  			-- Name follow by a comma or semicolon
  
+ 	declared_type: ET_DECLARED_TYPE
+ 			-- Declared type (type preceded by a colon)
+ 
  	formal_argument_item: ET_FORMAL_ARGUMENT is
  			-- Formal argument in semicolon-separated list
***************
*** 63,74 ****
  feature -- Setting
  
! 	set_type (a_type: like type) is
! 			-- Set `type' to `a_type'.
  		require
  			a_type_not_void: a_type /= Void
  		do
! 			type := a_type
  		ensure
! 			type_set: type = a_type
  		end
  
--- 69,80 ----
  feature -- Setting
  
! 	set_declared_type (a_type: like declared_type) is
! 			-- Set `declared_type' to `a_type'.
  		require
  			a_type_not_void: a_type /= Void
  		do
! 			declared_type := a_type
  		ensure
! 			declared_type_set: declared_type = a_type
  		end
  
***************
*** 88,93 ****
  			immediate_or_redeclared: a_feature.implementation_class = a_class
  		do
! 			type := type.resolved_identifier_types (a_feature, args, a_class)
  		end
  
  end
--- 94,104 ----
  			immediate_or_redeclared: a_feature.implementation_class = a_class
  		do
! 			declared_type := declared_type.resolved_identifier_types (a_feature, args, a_class)
  		end
+ 
+ invariant
+ 
+ 	name_item_not_void: name_item /= Void
+ 	declared_type_not_void: declared_type /= Void
  
  end

Index: et_formal_arguments.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_formal_arguments.e,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** et_formal_arguments.e	6 Apr 2002 16:29:28 -0000	1.6
--- et_formal_arguments.e	22 Sep 2002 10:53:38 -0000	1.7
***************
*** 186,204 ****
  			i: INTEGER
  			arg: ET_FORMAL_ARGUMENT
! 			a_type, new_type: ET_TYPE
  		do
  			i := count
  			from until i < 1 loop
  				arg := formal_argument (i)
! 				if arg.type = a_type then
  						-- This argument shares the same
  						-- type as the previous argument.
! 					arg.set_type (new_type)
  				else
! 					a_type := arg.type
! 					if a_type.has_formal_parameters (actual_parameters) then
  						new_type := a_type.deep_cloned_type
  						new_type := new_type.resolved_formal_parameters (actual_parameters)
! 						arg.set_type (new_type)
  					else
  						new_type := a_type
--- 186,204 ----
  			i: INTEGER
  			arg: ET_FORMAL_ARGUMENT
! 			a_type, new_type: ET_DECLARED_TYPE
  		do
  			i := count
  			from until i < 1 loop
  				arg := formal_argument (i)
! 				if arg.declared_type = a_type then
  						-- This argument shares the same
  						-- type as the previous argument.
! 					arg.set_declared_type (new_type)
  				else
! 					a_type := arg.declared_type
! 					if a_type.declared_type.has_formal_parameters (actual_parameters) then
  						new_type := a_type.deep_cloned_type
  						new_type := new_type.resolved_formal_parameters (actual_parameters)
! 						arg.set_declared_type (new_type)
  					else
  						new_type := a_type

Index: et_function.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_function.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_function.e	6 Apr 2002 16:29:28 -0000	1.5
--- et_function.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 61,67 ****
  			-- Undefined version of current feature
  		do
! 			Result := universe.new_deferred_function (a_name,
! 				arguments, type, obsolete_message, preconditions, postconditions,
  				clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			if seeds /= Void then
--- 61,69 ----
  			-- Undefined version of current feature
  		do
! 			Result := universe.new_deferred_function (a_name, arguments,
! 				declared_type, obsolete_message, preconditions, postconditions,
  				clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			if seeds /= Void then
***************
*** 112,117 ****
  		do
  			if type.has_formal_parameters (actual_parameters) then
! 				type := type.deep_cloned_type
! 				type := type.resolved_formal_parameters (actual_parameters)
  			end
  			if arguments /= Void then
--- 114,119 ----
  		do
  			if type.has_formal_parameters (actual_parameters) then
! 				declared_type := declared_type.deep_cloned_type
! 				declared_type := declared_type.resolved_formal_parameters (actual_parameters)
  			end
  			if arguments /= Void then
***************
*** 134,138 ****
  				arguments.resolve_identifier_types (Current, a_class)
  			end
! 			type := type.resolved_identifier_types (Current, arguments, a_class)
  		end
  
--- 136,140 ----
  				arguments.resolve_identifier_types (Current, a_class)
  			end
! 			declared_type := declared_type.resolved_identifier_types (Current, arguments, a_class)
  		end
  

Index: et_internal_function.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_internal_function.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_internal_function.e	6 Apr 2002 16:29:28 -0000	1.5
--- et_internal_function.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 27,31 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; args: like arguments; a_type: like type;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_locals: like locals; a_compound: like compound;
--- 27,31 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; args: like arguments; a_type: like declared_type;
  		an_obsolete: like obsolete_message; a_preconditions: like preconditions;
  		a_locals: like locals; a_compound: like compound;
***************
*** 36,47 ****
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
  			arguments := args
! 			type := a_type
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
--- 36,49 ----
  			a_name_not_void: a_name /= Void
  			a_type_not_void: a_type /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
  			arguments := args
! 			declared_type := a_type
! 			is_keyword := tokens.is_keyword
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
***************
*** 50,53 ****
--- 52,56 ----
  			postconditions := a_postconditions
  			rescue_clause := a_rescue
+ 			end_keyword := tokens.end_keyword
  			clients := a_clients
  			version := an_id
***************
*** 56,62 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
  			arguments_set: arguments = args
! 			type_set: type = a_type
  			obsolete_message_set: obsolete_message = an_obsolete
  			preconditions_set: preconditions = a_preconditions
--- 59,65 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
  			arguments_set: arguments = args
! 			declared_type_set: declared_type = a_type
  			obsolete_message_set: obsolete_message = an_obsolete
  			preconditions_set: preconditions = a_preconditions
***************
*** 86,92 ****
  				locals.add_to_system
  			end
! 			if compound /= Void then
! 				compound.add_to_system
! 			end
  		end
  
--- 89,93 ----
  				locals.add_to_system
  			end
! 			compound.add_to_system
  		end
  

Index: et_internal_procedure.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_internal_procedure.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_internal_procedure.e	6 Apr 2002 16:29:28 -0000	1.5
--- et_internal_procedure.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 24,28 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; args: like arguments; an_obsolete: like obsolete_message;
  		a_preconditions: like preconditions; a_locals: like locals;
  		a_compound: like compound; a_postconditions: like postconditions;
--- 24,28 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; args: like arguments; an_obsolete: like obsolete_message;
  		a_preconditions: like preconditions; a_locals: like locals;
  		a_compound: like compound; a_postconditions: like postconditions;
***************
*** 32,42 ****
  		require
  			a_name_not_void: a_name /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
  			arguments := args
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
--- 32,44 ----
  		require
  			a_name_not_void: a_name /= Void
+ 			a_compound_not_void: a_compound /= Void
  			a_clients_not_void: a_clients /= Void
  			a_class_not_void: a_class /= Void
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
  			arguments := args
+ 			is_keyword := tokens.is_keyword
  			obsolete_message := an_obsolete
  			preconditions := a_preconditions
***************
*** 45,48 ****
--- 47,51 ----
  			postconditions := a_postconditions
  			rescue_clause := a_rescue
+ 			end_keyword := tokens.end_keyword
  			clients := a_clients
  			version := an_id
***************
*** 51,55 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
  			arguments_set: arguments = args
  			obsolete_message_set: obsolete_message = an_obsolete
--- 54,58 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
  			arguments_set: arguments = args
  			obsolete_message_set: obsolete_message = an_obsolete
***************
*** 79,85 ****
  				locals.add_to_system
  			end
! 			if compound /= Void then
! 				compound.add_to_system
! 			end
  		end
  
--- 82,86 ----
  				locals.add_to_system
  			end
! 			compound.add_to_system
  		end
  

Index: et_internal_routine.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_internal_routine.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_internal_routine.e	6 Apr 2002 16:29:28 -0000	1.3
--- et_internal_routine.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 28,30 ****
--- 28,34 ----
  			-- Rescue clause
  
+ invariant
+ 
+ 	compound_not_void: compound /= Void
+ 
  end

Index: et_local_variable.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_local_variable.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_local_variable.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_local_variable.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 19,23 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; a_type: like type) is
  			-- Create a new local variable.
  		require
--- 19,23 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; a_type: like declared_type) is
  			-- Create a new local variable.
  		require
***************
*** 26,33 ****
  		do
  			name_item := a_name
! 			type := a_type
  		ensure
  			name_set: name_item = a_name
! 			type_set: type = a_type
  		end
  
--- 26,33 ----
  		do
  			name_item := a_name
! 			declared_type := a_type
  		ensure
  			name_set: name_item = a_name
! 			declared_type_set: declared_type = a_type
  		end
  
***************
*** 37,51 ****
  			-- Name
  		do
! 			Result := name_item.identifier_item
  		ensure
  			name_not_void: Result /= Void
  		end
  
! 	type: ET_TYPE
  			-- Type
  
  	name_item: ET_LOCAL_NAME
  			-- Name follow by a comma or semicolon
  
  	local_variable_item: ET_LOCAL_VARIABLE is
  			-- Local variable in semicolon-separated list
--- 37,57 ----
  			-- Name
  		do
! 			Result := name_item.identifier
  		ensure
  			name_not_void: Result /= Void
  		end
  
! 	type: ET_TYPE is
  			-- Type
+ 		do
+ 			Result := declared_type.declared_type
+ 		end
  
  	name_item: ET_LOCAL_NAME
  			-- Name follow by a comma or semicolon
  
+ 	declared_type: ET_DECLARED_TYPE
+ 			-- Declared type (type preceded by a colon)
+ 
  	local_variable_item: ET_LOCAL_VARIABLE is
  			-- Local variable in semicolon-separated list
***************
*** 64,67 ****
--- 70,74 ----
  
  	name_item_not_void: name_item /= Void
+ 	declared_type_not_void: declared_type /= Void
  
  end

Index: et_once_function.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_once_function.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_once_function.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_once_function.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 23,32 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
! 			Result := universe.new_once_function (a_name, arguments, type,
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
  		end
  
--- 23,35 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
! 			Result := universe.new_once_function (a_name, arguments, declared_type,
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 36,44 ****
  			-- Renamed version of current feature
  		do
! 			Result := universe.new_once_function (a_name, arguments, type,
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
--- 39,50 ----
  			-- Renamed version of current feature
  		do
! 			Result := universe.new_once_function (a_name, arguments, declared_type,
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_once_procedure.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_once_procedure.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_once_procedure.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_once_procedure.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 23,27 ****
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
--- 23,27 ----
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
***************
*** 29,32 ****
--- 29,35 ----
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
+ 			Result.set_synonym (Current)
  		end
  
***************
*** 39,44 ****
--- 42,50 ----
  				obsolete_message, preconditions, locals, compound, postconditions,
  				rescue_clause, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)

Index: et_procedure.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_procedure.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_procedure.e	6 Apr 2002 16:29:28 -0000	1.5
--- et_procedure.e	22 Sep 2002 10:53:39 -0000	1.6
***************
*** 42,45 ****
--- 42,47 ----
  			Result := universe.new_deferred_procedure (a_name, arguments,
  				obsolete_message, preconditions, postconditions, clients, current_class)
+ 			Result.set_is_keyword (is_keyword)
+ 			Result.set_end_keyword (end_keyword)
  			Result.set_implementation_class (implementation_class)
  			if seeds /= Void then

Index: et_query.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_query.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_query.e	6 Apr 2002 16:29:28 -0000	1.5
--- et_query.e	22 Sep 2002 10:53:39 -0000	1.6
***************
*** 19,24 ****
  feature -- Access
  
! 	type: ET_TYPE
  			-- Return type
  
  	signature: ET_SIGNATURE is
--- 19,32 ----
  feature -- Access
  
! 	type: ET_TYPE is
  			-- Return type
+ 		do
+ 			Result := declared_type.declared_type
+ 		ensure
+ 			type_not_void: Result /= Void
+ 		end
+ 
+ 	declared_type: ET_DECLARED_TYPE
+ 			-- Declared type (type preceded by a colon)
  
  	signature: ET_SIGNATURE is
***************
*** 34,39 ****
  			-- Undefined version of current feature
  		do
! 			Result := universe.new_deferred_function (a_name,
! 				Void, type, Void, Void, Void, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			if seeds /= Void then
--- 42,47 ----
  			-- Undefined version of current feature
  		do
! 			Result := universe.new_deferred_function (a_name, Void,
! 				declared_type, Void, Void, Void, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			if seeds /= Void then
***************
*** 76,81 ****
  		do
  			if type.has_formal_parameters (actual_parameters) then
! 				type := type.deep_cloned_type
! 				type := type.resolved_formal_parameters (actual_parameters)
  			end
  		end
--- 84,89 ----
  		do
  			if type.has_formal_parameters (actual_parameters) then
! 				declared_type := declared_type.deep_cloned_type
! 				declared_type := declared_type.resolved_formal_parameters (actual_parameters)
  			end
  		end
***************
*** 89,98 ****
  			-- true if an error occurs.
  		do
! 			type := type.resolved_identifier_types (Current, Void, a_class)
  		end
  
  invariant
  
! 	type_not_void: type /= Void
  
  end
--- 97,106 ----
  			-- true if an error occurs.
  		do
! 			declared_type := declared_type.resolved_identifier_types (Current, Void, a_class)
  		end
  
  invariant
  
! 	declared_type_not_void: declared_type /= Void
  
  end

Index: et_routine.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_routine.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_routine.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_routine.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 17,20 ****
--- 17,22 ----
  	ET_FEATURE
  
+ 	ET_SHARED_TOKEN_CONSTANTS
+ 
  feature -- Access
  
***************
*** 22,25 ****
--- 24,30 ----
  			-- Formal arguments
  
+ 	is_keyword: ET_TOKEN
+ 			-- 'is' keyword
+ 
  	obsolete_message: ET_OBSOLETE
  			-- Obsolete message
***************
*** 30,33 ****
--- 35,74 ----
  	postconditions: ET_POSTCONDITIONS
  			-- Postconditions
+ 
+ 	end_keyword: ET_TOKEN
+ 			-- 'end' keyword
+ 
+ 	break: ET_BREAK is
+ 			-- Break which appears just after current node
+ 		do
+ 			Result := end_keyword.break
+ 		end
+ 
+ feature -- Setting
+ 
+ 	set_is_keyword (an_is: like is_keyword) is
+ 			-- Set `is_keyword' to `an_is'.
+ 		require
+ 			an_is_not_void: an_is /= Void
+ 		do
+ 			is_keyword := an_is
+ 		ensure
+ 			is_keyword_set: is_keyword = an_is
+ 		end
+ 
+ 	set_end_keyword (an_end: like end_keyword) is
+ 			-- Set `end_keyword' to `an_end'.
+ 		require
+ 			an_end_not_void: an_end /= Void
+ 		do
+ 			end_keyword := an_end
+ 		ensure
+ 			end_keyword_set: end_keyword = an_end
+ 		end
+ 
+ invariant
+ 
+ 	is_keyword_not_void: is_keyword /= Void
+ 	end_keyword_not_void: end_keyword /= Void
  
  end

Index: et_unique_attribute.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/feature/et_unique_attribute.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_unique_attribute.e	6 Apr 2002 16:29:28 -0000	1.4
--- et_unique_attribute.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 21,24 ****
--- 21,26 ----
  		end
  
+ 	ET_SHARED_TOKEN_CONSTANTS
+ 
  creation
  
***************
*** 27,31 ****
  feature {NONE} -- Initialization
  
! 	make (a_name: like name; a_type: like type; a_clients: like clients;
  		a_class: like current_class; an_id: INTEGER) is
  			-- Create a new unique attribute.
--- 29,33 ----
  feature {NONE} -- Initialization
  
! 	make (a_name: like name_item; a_type: like declared_type; a_clients: like clients;
  		a_class: like current_class; an_id: INTEGER) is
  			-- Create a new unique attribute.
***************
*** 37,43 ****
  			an_id_positive: an_id > 0
  		do
! 			name := a_name
  			id := an_id
! 			type := a_type
  			clients := a_clients
  			version := an_id
--- 39,47 ----
  			an_id_positive: an_id > 0
  		do
! 			name_item := a_name
  			id := an_id
! 			declared_type := a_type
! 			is_keyword := tokens.is_keyword
! 			unique_keyword := tokens.unique_keyword
  			clients := a_clients
  			version := an_id
***************
*** 46,51 ****
  			first_seed := an_id
  		ensure
! 			name_set: name = a_name
! 			type_set: type = a_type
  			clients_set: clients = a_clients
  			version_set: version = an_id
--- 50,55 ----
  			first_seed := an_id
  		ensure
! 			name_item_set: name_item = a_name
! 			declared_type_set: declared_type = a_type
  			clients_set: clients = a_clients
  			version_set: version = an_id
***************
*** 65,75 ****
  			-- the form 'prefix ...'?
  
  feature -- Duplication
  
! 	synonym (a_name: like name): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_unique_attribute (a_name,
! 				type, clients, current_class)
  		end
  
--- 69,118 ----
  			-- the form 'prefix ...'?
  
+ feature -- Access
+ 
+ 	is_keyword: ET_TOKEN
+ 			-- 'is' keyword
+ 
+ 	unique_keyword: ET_TOKEN
+ 			-- 'unique' keyword
+ 
+ 	break: ET_BREAK is
+ 			-- Break which appears just after current node
+ 		do
+ 			Result := unique_keyword.break
+ 		end
+ 
+ feature -- Setting
+ 
+ 	set_is_keyword (an_is: like is_keyword) is
+ 			-- Set `is_keyword' to `an_is'.
+ 		require
+ 			an_is_not_void: an_is /= Void
+ 		do
+ 			is_keyword := an_is
+ 		ensure
+ 			is_keyword_set: is_keyword = an_is
+ 		end
+ 
+ 	set_unique_keyword (a_unique: like unique_keyword) is
+ 			-- Set `unique_keyword' to `a_unique'.
+ 		require
+ 			a_unique_not_void: a_unique /= Void
+ 		do
+ 			unique_keyword := a_unique
+ 		ensure
+ 			unique_keyword_set: unique_keyword = a_unique
+ 		end
+ 
  feature -- Duplication
  
! 	new_synonym (a_name: like name_item): like Current is
  			-- Synonym feature
  		do
  			Result := universe.new_unique_attribute (a_name,
! 				declared_type, clients, current_class)
! 			Result.set_is_keyword (is_keyword)
! 			Result.set_unique_keyword (unique_keyword)
! 			Result.set_synonym (Current)
  		end
  
***************
*** 80,86 ****
  		do
  			Result := universe.new_unique_attribute (a_name,
! 				type, clients, current_class)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
--- 123,132 ----
  		do
  			Result := universe.new_unique_attribute (a_name,
! 				declared_type, clients, current_class)
! 			Result.set_is_keyword (is_keyword)
! 			Result.set_unique_keyword (unique_keyword)
  			Result.set_implementation_class (implementation_class)
  			Result.set_version (version)
+ 			Result.set_frozen_keyword (frozen_keyword)
  			if seeds /= Void then
  				Result.set_seeds (seeds)
***************
*** 94,97 ****
--- 140,148 ----
  			end
  		end
+ 
+ invariant
+ 
+ 	is_keyword_not_void: is_keyword /= Void
+ 	unique_keyword_not_void: unique_keyword /= Void
  
  end

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/instruction
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/instruction

Modified Files:
	et_debug_keys.e 
Log Message:
Continued decorating the abstract syntax tree.

Index: et_debug_keys.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/instruction/et_debug_keys.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_debug_keys.e	6 Apr 2002 16:29:49 -0000	1.4
--- et_debug_keys.e	22 Sep 2002 10:53:39 -0000	1.5
***************
*** 70,74 ****
  			i_small_enough: i <= count
  		do
! 			Result := item (i).manifest_string_item
  		ensure
  			key_not_void: Result /= Void
--- 70,74 ----
  			i_small_enough: i <= count
  		do
! 			Result := item (i).manifest_string
  		ensure
  			key_not_void: Result /= Void

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/expression
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/expression

Modified Files:
	et_expression.e et_expression_comma.e et_expression_item.e 
	et_expression_list.e et_manifest_string_comma.e 
	et_manifest_string_item.e 
Added Files:
	et_keyword_manifest_string.e 
Log Message:
Continued decorating the abstract syntax tree.

--- NEW FILE: et_keyword_manifest_string.e ---
indexing

	description:

		"Eiffel manifest strings preceded by a keyword"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:38 $"
	revision: "$Revision: 1.1 $"

class ET_KEYWORD_MANIFEST_STRING

inherit

	ET_EXTERNAL_LANGUAGE
	ET_EXTERNAL_ALIAS

creation

	make

feature {NONE} -- Initialization

	make (a_keyword: like keyword; a_string: like manifest_string) is
			-- Create a new keyword-manifest_string.
		require
			a_keyword_not_void: a_keyword /= Void
			a_string_not_void: a_string /= Void
		do
			keyword := a_keyword
			manifest_string := a_string
		ensure
			keyword_set: keyword = a_keyword
			manifest_string_set: manifest_string = a_string
		end

feature -- Access

	keyword: ET_TOKEN
			-- Keyword

	manifest_string: ET_MANIFEST_STRING
			-- Manifest string

	position: ET_POSITION is
			-- Position of first character of
			-- current node in source code
		do
			Result := keyword.position
		end

	break: ET_BREAK is
			-- Break which appears just after current node
		do
			Result := manifest_string.break
		end

invariant

	keyword_not_void: keyword /= Void
	manifest_string_not_void: manifest_string /= Void

end

Index: et_expression.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/expression/et_expression.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** et_expression.e	6 Apr 2002 16:29:05 -0000	1.5
--- et_expression.e	22 Sep 2002 10:53:38 -0000	1.6
***************
*** 16,19 ****
--- 16,23 ----
  
  	ET_EXPRESSION_ITEM
+ 		rename
+ 			expression as expression_item
+ 		end
+ 
  	ET_ASSERTION
  

Index: et_expression_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/expression/et_expression_comma.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_expression_comma.e	6 Apr 2002 16:29:05 -0000	1.4
--- et_expression_comma.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (an_expression: like expression_item; a_comma: like comma) is
  			-- Create a new expression-comma.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (an_expression: like expression; a_comma: like comma) is
  			-- Create a new expression-comma.
  		require
***************
*** 29,36 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			expression_item := an_expression
  			comma := a_comma
  		ensure
! 			expression_item_set: expression_item = an_expression
  			comma_set: comma = a_comma
  		end
--- 29,36 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			expression := an_expression
  			comma := a_comma
  		ensure
! 			expression_set: expression = an_expression
  			comma_set: comma = a_comma
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	expression_item: ET_EXPRESSION
  			-- Expression in comma-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	expression: ET_EXPRESSION
  			-- Expression in comma-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := expression_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := expression.position
  		end
  

Index: et_expression_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/expression/et_expression_item.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_expression_item.e	6 Apr 2002 16:29:05 -0000	1.3
--- et_expression_item.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	expression_item: ET_EXPRESSION is
  			-- Expression in comma-separated list
  		deferred
  		ensure
! 			expression_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	expression: ET_EXPRESSION is
  			-- Expression in comma-separated list
  		deferred
  		ensure
! 			expression_not_void: Result /= Void
  		end
  

Index: et_expression_list.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/expression/et_expression_list.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_expression_list.e	6 Apr 2002 16:29:05 -0000	1.4
--- et_expression_list.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 70,74 ****
  			i_small_enough: i <= count
  		do
! 			Result := item (i).expression_item
  		ensure
  			expression_not_void: Result /= Void
--- 70,74 ----
  			i_small_enough: i <= count
  		do
! 			Result := item (i).expression
  		ensure
  			expression_not_void: Result /= Void

Index: et_manifest_string_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/expression/et_manifest_string_comma.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_manifest_string_comma.e	6 Apr 2002 16:29:05 -0000	1.3
--- et_manifest_string_comma.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (a_manifest_string: like manifest_string_item; a_comma: like comma) is
  			-- Create a new manifest_string-comma.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_manifest_string: like manifest_string; a_comma: like comma) is
  			-- Create a new manifest_string-comma.
  		require
***************
*** 29,36 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			manifest_string_item := a_manifest_string
  			comma := a_comma
  		ensure
! 			manifest_string_item_set: manifest_string_item = a_manifest_string
  			comma_set: comma = a_comma
  		end
--- 29,36 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			manifest_string := a_manifest_string
  			comma := a_comma
  		ensure
! 			manifest_string_set: manifest_string = a_manifest_string
  			comma_set: comma = a_comma
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	manifest_string_item: ET_MANIFEST_STRING
  			-- Manifest string in comma-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	manifest_string: ET_MANIFEST_STRING
  			-- Manifest string in comma-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := manifest_string_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := manifest_string.position
  		end
  

Index: et_manifest_string_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/expression/et_manifest_string_item.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_manifest_string_item.e	6 Apr 2002 16:29:05 -0000	1.4
--- et_manifest_string_item.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 19,27 ****
  feature -- Access
  
! 	manifest_string_item: ET_MANIFEST_STRING is
  			-- Manifest string in comma-separated list
  		deferred
  		ensure
! 			manifest_string_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	manifest_string: ET_MANIFEST_STRING is
  			-- Manifest string in comma-separated list
  		deferred
  		ensure
! 			manifest_string_not_void: Result /= Void
  		end

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/class

Modified Files:
	et_class.e et_formal_generic_parameter.e 
	et_formal_generic_parameter_comma.e 
	et_formal_generic_parameter_item.e 
	et_formal_generic_parameters.e et_indexing.e 
	et_indexing_item.e et_indexing_semicolon.e et_indexing_term.e 
	et_indexing_term_comma.e et_indexing_term_item.e et_parent.e 
	et_parent_item.e et_parent_semicolon.e et_parents.e 
Added Files:
	et_feature_clause.e et_feature_clauses.e 
Log Message:
Continued decorating the abstract syntax tree.

--- NEW FILE: et_feature_clause.e ---
indexing

	description:

		"Eiffel feature clauses"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:38 $"
	revision: "$Revision: 1.1 $"

class ET_FEATURE_CLAUSE

inherit

	ET_AST_NODE

	ET_AST_LIST [ET_FEATURE_ITEM]
		rename
			make as make_ast_list,
			make_with_capacity as make_ast_list_with_capacity
		end

creation

	make, make_with_capacity

feature {NONE} -- Initialization

	make (a_feature: like feature_keyword; a_clients: like clients) is
			-- Create a new feature clause.
		require
			a_feature_not_void: a_feature /= Void
			a_clients_not_void: a_clients /= Void
		do
			feature_keyword := a_feature
			clients := a_clients
			make_ast_list
		ensure
			feature_keyword_set: feature_keyword = a_feature
			clients_set: clients = a_clients
			is_empty: is_empty
			capacity_set: capacity = 0
		end

	make_with_capacity (a_feature: like feature_keyword; a_clients: like clients; nb: INTEGER) is
			-- Create a new feature clause with capacity `nb'.
		require
			a_feature_not_void: a_feature /= Void
			a_clients_not_void: a_clients /= Void
			nb_positive: nb >= 0
		do
			feature_keyword := a_feature
			clients := a_clients
			make_ast_list_with_capacity (nb)
		ensure
			feature_keyword_set: feature_keyword = a_feature
			clients_set: clients = a_clients
			is_empty: is_empty
			capacity_set: capacity = nb
		end

feature -- Access

	feature_keyword: ET_TOKEN
			-- 'feature' keyword

	clients: ET_CLASS_NAME_LIST
			-- Clients

	clients_clause: ET_CLIENTS is
			-- Clients clause
		do
			Result ?= clients
		end

	position: ET_POSITION is
			-- Position of first character of
			-- current node in source code
		do
			Result := feature_keyword.position
		end

	break: ET_BREAK is
			-- Break which appears just after current node
		local
			a_clients_clause: ET_CLIENTS
		do
			if is_empty then
				a_clients_clause := clients_clause
				if a_clients_clause /= Void then
					Result := a_clients_clause.break
				else
					Result := feature_keyword.break
				end
			else
				Result := item (count).break
			end
		end

feature -- Setting

	set_feature_keyword (a_feature: like feature_keyword) is
			-- Set `feature_keyword' to `a_feature'.
		require
			a_feature_not_void: a_feature /= Void
		do
			feature_keyword := a_feature
		ensure
			feature_keyword_set: feature_keyword = a_feature
		end

	set_clients (a_clients: like clients) is
			-- Set `clients' to `a_clients'.
		require
			a_clients_not_void: a_clients /= Void
		do
			clients := a_clients
		ensure
			clients_set: clients = a_clients
		end

feature {NONE} -- Implementation

	fixed_array: KL_FIXED_ARRAY_ROUTINES [ET_FEATURE_ITEM] is
			-- Fixed array routines
		once
			!! Result
		end

invariant

	feature_keyword_not_void: feature_keyword /= Void
	clients_not_void: clients /= Void

end

--- NEW FILE: et_feature_clauses.e ---
indexing

	description:

		"Eiffel feature clause lists"

	library: "Gobo Eiffel Tools Library"
	copyright: "Copyright (c) 2002, Eric Bezault and others"
	license: "Eiffel Forum License v1 (see forum.txt)"
	date: "$Date: 2002/09/22 10:53:38 $"
	revision: "$Revision: 1.1 $"

class ET_FEATURE_CLAUSES

inherit

	ET_AST_NODE

	ET_AST_LIST [ET_FEATURE_CLAUSE]
		rename
			make as make_ast_list,
			make_with_capacity as make_ast_list_with_capacity
		end

creation

	make, make_with_capacity

feature {NONE} -- Initialization

	make (a_feature_clause: like item) is
			-- Create a new feature clause list with initially
			-- one clause `a_feature_clause'.
		require
			a_feature_clause_not_void: a_feature_clause /= Void
		do
			make_ast_list_with_capacity (1)
			put_first (a_feature_clause)
		ensure
			feature_clause_set: item (1) = a_feature_clause
			capacity_set: capacity = 1
		end

	make_with_capacity (a_feature_clause: like item; nb: INTEGER) is
			-- Create a new feature clause list with capacity
			-- `nb' and initially one clause `a_feature_clause'.
		require
			a_feature_clause_not_void: a_feature_clause /= Void
			nb_positive: nb >= 1
		do
			make_ast_list_with_capacity (nb)
			put_first (a_feature_clause)
		ensure
			feature_clause_set: item (1) = a_feature_clause
			capacity_set: capacity = nb
		end

feature -- Access

	position: ET_POSITION is
			-- Position of first character of
			-- current node in source code
		do
			Result := item (1).position
		end

	break: ET_BREAK is
			-- Break which appears just after current node
		do
			Result := item (count).break
		end

feature {NONE} -- Implementation

	fixed_array: KL_FIXED_ARRAY_ROUTINES [ET_FEATURE_CLAUSE] is
			-- Fixed array routines
		once
			!! Result
		end

invariant

	not_empty: not is_empty

end

Index: et_class.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_class.e,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** et_class.e	12 Sep 2002 08:57:35 -0000	1.12
--- et_class.e	22 Sep 2002 10:53:38 -0000	1.13
***************
*** 297,300 ****
--- 297,313 ----
  			-- Does current class have proper descendants?
  
+ feature -- Feature clauses
+ 
+ 	feature_clauses: ET_FEATURE_CLAUSES
+ 			-- Feature clauses
+ 
+ 	set_feature_clauses (a_feature_clauses: like feature_clauses) is
+ 			-- Set `feature_clauses' to `a_feature_clauses'.
+ 		do
+ 			feature_clauses := a_feature_clauses
+ 		ensure
+ 			feature_clauses_set: feature_clauses = a_feature_clauses
+ 		end
+ 
  feature -- Features
  

Index: et_formal_generic_parameter.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_formal_generic_parameter.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_formal_generic_parameter.e	6 Apr 2002 16:28:17 -0000	1.4
--- et_formal_generic_parameter.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 62,66 ****
  		end
  
! 	formal_generic_parameter_item: ET_FORMAL_GENERIC_PARAMETER is
  			-- Formal generic parameter in comma-separated list
  		do
--- 62,66 ----
  		end
  
! 	formal_generic_parameter: ET_FORMAL_GENERIC_PARAMETER is
  			-- Formal generic parameter in comma-separated list
  		do

Index: et_formal_generic_parameter_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_formal_generic_parameter_comma.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_formal_generic_parameter_comma.e	6 Apr 2002 16:28:17 -0000	1.3
--- et_formal_generic_parameter_comma.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (a_formal: like formal_generic_parameter_item; a_comma: like comma) is
  			-- Create a new formal_generic_parameter-comma.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_formal: like formal_generic_parameter; a_comma: like comma) is
  			-- Create a new formal_generic_parameter-comma.
  		require
***************
*** 29,36 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			formal_generic_parameter_item := a_formal
  			comma := a_comma
  		ensure
! 			formal_generic_parameter_item_set: formal_generic_parameter_item = a_formal
  			comma_set: comma = a_comma
  		end
--- 29,36 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			formal_generic_parameter := a_formal
  			comma := a_comma
  		ensure
! 			formal_generic_parameter_set: formal_generic_parameter = a_formal
  			comma_set: comma = a_comma
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	formal_generic_parameter_item: ET_FORMAL_GENERIC_PARAMETER
  			-- Formal generic parameter in comma-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	formal_generic_parameter: ET_FORMAL_GENERIC_PARAMETER
  			-- Formal generic parameter in comma-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := formal_generic_parameter_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := formal_generic_parameter.position
  		end
  

Index: et_formal_generic_parameter_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_formal_generic_parameter_item.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_formal_generic_parameter_item.e	6 Apr 2002 16:28:17 -0000	1.3
--- et_formal_generic_parameter_item.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	formal_generic_parameter_item: ET_FORMAL_GENERIC_PARAMETER is
  			-- Formal generic parameter in comma-separated list
  		deferred
  		ensure
! 			formal_generic_parameter_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	formal_generic_parameter: ET_FORMAL_GENERIC_PARAMETER is
  			-- Formal generic parameter in comma-separated list
  		deferred
  		ensure
! 			formal_generic_parameter_not_void: Result /= Void
  		end
  

Index: et_formal_generic_parameters.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_formal_generic_parameters.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_formal_generic_parameters.e	6 Apr 2002 16:28:17 -0000	1.4
--- et_formal_generic_parameters.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 79,83 ****
  			i_small_enough: i <= count
  		do
! 			Result := formal_generic_parameter_item (i).formal_generic_parameter_item
  		ensure
  			item_not_void: Result /= Void
--- 79,83 ----
  			i_small_enough: i <= count
  		do
! 			Result := formal_generic_parameter_item (i).formal_generic_parameter
  		ensure
  			item_not_void: Result /= Void
***************
*** 320,324 ****
  		do
  			precursor (an_item)
! 			an_item.formal_generic_parameter_item.set_index (capacity - count + 1)
  		end
  
--- 320,324 ----
  		do
  			precursor (an_item)
! 			an_item.formal_generic_parameter.set_index (capacity - count + 1)
  		end
  

Index: et_indexing.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_indexing.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** et_indexing.e	12 Sep 2002 08:57:35 -0000	1.1
--- et_indexing.e	22 Sep 2002 10:53:38 -0000	1.2
***************
*** 43,47 ****
  			-- Indexing terms
  
! 	indexing_item: ET_INDEXING is
  			-- Indexing clause in semicolon-separated list
  		do
--- 43,47 ----
  			-- Indexing terms
  
! 	indexing_clause: ET_INDEXING is
  			-- Indexing clause in semicolon-separated list
  		do

Index: et_indexing_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_indexing_item.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** et_indexing_item.e	12 Sep 2002 08:57:35 -0000	1.1
--- et_indexing_item.e	22 Sep 2002 10:53:38 -0000	1.2
***************
*** 19,27 ****
  feature -- Access
  
! 	indexing_item: ET_INDEXING is
  			-- Indexing clause in semicolon-separated list
  		deferred
  		ensure
! 			indexing_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	indexing_clause: ET_INDEXING is
  			-- Indexing clause in semicolon-separated list
  		deferred
  		ensure
! 			indexing_clause_not_void: Result /= Void
  		end
  

Index: et_indexing_semicolon.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_indexing_semicolon.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** et_indexing_semicolon.e	12 Sep 2002 08:57:35 -0000	1.1
--- et_indexing_semicolon.e	22 Sep 2002 10:53:38 -0000	1.2
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (an_indexing: like indexing_item_item; a_semicolon: like semicolon) is
  			-- Create a new indexing-semicolon.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (an_indexing: like indexing_item; a_semicolon: like semicolon) is
  			-- Create a new indexing-semicolon.
  		require
***************
*** 29,36 ****
  			a_semicolon_not_void: a_semicolon /= Void
  		do
! 			indexing_item_item := an_indexing
  			semicolon := a_semicolon
  		ensure
! 			indexing_item_item_set: indexing_item_item = an_indexing
  			semicolon_set: semicolon = a_semicolon
  		end
--- 29,36 ----
  			a_semicolon_not_void: a_semicolon /= Void
  		do
! 			indexing_item := an_indexing
  			semicolon := a_semicolon
  		ensure
! 			indexing_item_set: indexing_item = an_indexing
  			semicolon_set: semicolon = a_semicolon
  		end
***************
*** 38,48 ****
  feature -- Access
  
! 	indexing_item: ET_INDEXING is
  			-- Indexing clause in semicolon-separated list
  		do
! 			Result := indexing_item_item.indexing_item
  		end
  
! 	indexing_item_item: ET_INDEXING_ITEM
  			-- Indexing clause item
  			-- (This allows several semicolons by nesting
--- 38,48 ----
  feature -- Access
  
! 	indexing_clause: ET_INDEXING is
  			-- Indexing clause in semicolon-separated list
  		do
! 			Result := indexing_item.indexing_clause
  		end
  
! 	indexing_item: ET_INDEXING_ITEM
  			-- Indexing clause item
  			-- (This allows several semicolons by nesting
***************
*** 56,60 ****
  			-- current node in source code
  		do
! 			Result := indexing_item_item.position
  		end
  
--- 56,60 ----
  			-- current node in source code
  		do
! 			Result := indexing_item.position
  		end
  
***************
*** 67,71 ****
  invariant
  
! 	indexing_item_item_not_void: indexing_item_item /= Void
  	semicolon_not_void: semicolon /= Void
  
--- 67,71 ----
  invariant
  
! 	indexing_item_not_void: indexing_item /= Void
  	semicolon_not_void: semicolon /= Void
  

Index: et_indexing_term.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_indexing_term.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** et_indexing_term.e	12 Sep 2002 08:57:35 -0000	1.1
--- et_indexing_term.e	22 Sep 2002 10:53:38 -0000	1.2
***************
*** 19,23 ****
  feature -- Access
  
! 	indexing_term_item: ET_INDEXING_TERM is
  			-- Indexing term in comma-separated list
  		do
--- 19,23 ----
  feature -- Access
  
! 	indexing_term: ET_INDEXING_TERM is
  			-- Indexing term in comma-separated list
  		do

Index: et_indexing_term_comma.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_indexing_term_comma.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** et_indexing_term_comma.e	12 Sep 2002 08:57:35 -0000	1.1
--- et_indexing_term_comma.e	22 Sep 2002 10:53:38 -0000	1.2
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (a_term: like indexing_term_item; a_comma: like comma) is
  			-- Create a new indexing_term-comma.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_term: like indexing_term; a_comma: like comma) is
  			-- Create a new indexing_term-comma.
  		require
***************
*** 29,36 ****
  			a_comma_not_void: a_comma /= Void
  		do
! 			indexing_term_item := a_term
  			comma := a_comma
  		ensure
! 			indexing_term_item_set: indexing_term_item = a_term
  			comma_set: comma = a_comma
  		end
--- 29,36 ----
  			a_comma_not_void: a_comma /= Void
  		do
! 			indexing_term := a_term
  			comma := a_comma
  		ensure
! 			indexing_term_set: indexing_term = a_term
  			comma_set: comma = a_comma
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	indexing_term_item: ET_INDEXING_TERM
  			-- Indexing term in comma-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	indexing_term: ET_INDEXING_TERM
  			-- Indexing term in comma-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := indexing_term_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := indexing_term.position
  		end
  

Index: et_indexing_term_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_indexing_term_item.e,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** et_indexing_term_item.e	12 Sep 2002 08:57:35 -0000	1.1
--- et_indexing_term_item.e	22 Sep 2002 10:53:38 -0000	1.2
***************
*** 19,27 ****
  feature -- Access
  
! 	indexing_term_item: ET_INDEXING_TERM is
  			-- Indexing term in comma-separated list
  		deferred
  		ensure
! 			indexing_term_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	indexing_term: ET_INDEXING_TERM is
  			-- Indexing term in comma-separated list
  		deferred
  		ensure
! 			indexing_term_not_void: Result /= Void
  		end
  

Index: et_parent.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_parent.e,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** et_parent.e	6 Apr 2002 16:28:17 -0000	1.7
--- et_parent.e	22 Sep 2002 10:53:38 -0000	1.8
***************
*** 75,79 ****
  			-- 'end' keyword
  
! 	parent_item: ET_PARENT is
  			-- Class parent in semicolon-separated list
  		do
--- 75,79 ----
  			-- 'end' keyword
  
! 	parent: ET_PARENT is
  			-- Class parent in semicolon-separated list
  		do

Index: et_parent_item.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_parent_item.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_parent_item.e	6 Apr 2002 16:28:17 -0000	1.3
--- et_parent_item.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 19,27 ****
  feature -- Access
  
! 	parent_item: ET_PARENT is
  			-- Class parent in semicolon-separated list
  		deferred
  		ensure
! 			parent_item_not_void: Result /= Void
  		end
  
--- 19,27 ----
  feature -- Access
  
! 	parent: ET_PARENT is
  			-- Class parent in semicolon-separated list
  		deferred
  		ensure
! 			parent_not_void: Result /= Void
  		end
  

Index: et_parent_semicolon.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_parent_semicolon.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** et_parent_semicolon.e	6 Apr 2002 16:28:17 -0000	1.3
--- et_parent_semicolon.e	22 Sep 2002 10:53:38 -0000	1.4
***************
*** 23,27 ****
  feature {NONE} -- Initialization
  
! 	make (a_parent: like parent_item; a_semicolon: like semicolon) is
  			-- Create a new parent-semicolon.
  		require
--- 23,27 ----
  feature {NONE} -- Initialization
  
! 	make (a_parent: like parent; a_semicolon: like semicolon) is
  			-- Create a new parent-semicolon.
  		require
***************
*** 29,36 ****
  			a_semicolon_not_void: a_semicolon /= Void
  		do
! 			parent_item := a_parent
  			semicolon := a_semicolon
  		ensure
! 			parent_item_set: parent_item = a_parent
  			semicolon_set: semicolon = a_semicolon
  		end
--- 29,36 ----
  			a_semicolon_not_void: a_semicolon /= Void
  		do
! 			parent := a_parent
  			semicolon := a_semicolon
  		ensure
! 			parent_set: parent = a_parent
  			semicolon_set: semicolon = a_semicolon
  		end
***************
*** 38,42 ****
  feature -- Access
  
! 	parent_item: ET_PARENT
  			-- Class parent in semicolon-separated list
  
--- 38,42 ----
  feature -- Access
  
! 	parent: ET_PARENT
  			-- Class parent in semicolon-separated list
  
***************
*** 48,52 ****
  			-- current node in source code
  		do
! 			Result := parent_item.position
  		end
  
--- 48,52 ----
  			-- current node in source code
  		do
! 			Result := parent.position
  		end
  

Index: et_parents.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/class/et_parents.e,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** et_parents.e	6 Apr 2002 16:28:17 -0000	1.4
--- et_parents.e	22 Sep 2002 10:53:38 -0000	1.5
***************
*** 64,68 ****
  			i_small_enough: i <= count
  		do
! 			Result := item (i).parent_item
  		ensure
  			parent_not_void: Result /= Void
--- 64,68 ----
  			i_small_enough: i <= count
  		do
! 			Result := item (i).parent
  		ensure
  			parent_not_void: Result /= Void

Update of /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/constant
In directory usw-pr-cvs1:/tmp/cvs-serv21501/library/tools/eiffel/ast/constant

Modified Files:
	et_manifest_string.e 
Log Message:
Continued decorating the abstract syntax tree.

Index: et_manifest_string.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/eiffel/ast/constant/et_manifest_string.e,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** et_manifest_string.e	12 Sep 2002 08:57:59 -0000	1.6
--- et_manifest_string.e	22 Sep 2002 10:53:38 -0000	1.7
***************
*** 21,24 ****
--- 21,28 ----
  	ET_INDEXING_TERM
  
+ 	ET_EXTERNAL_LANGUAGE
+ 
+ 	ET_EXTERNAL_ALIAS
+ 
  	ET_AST_LEAF
  		rename
***************
*** 39,43 ****
  		end
  
! 	manifest_string_item: ET_MANIFEST_STRING is
  			-- Manifest string in comma-separated list
  		do
--- 43,47 ----
  		end
  
! 	manifest_string: ET_MANIFEST_STRING is
  			-- Manifest string in comma-separated list
  		do

Update of /cvsroot/gobo-eiffel/gobo/library/tools/lace/parser
In directory usw-pr-cvs1:/tmp/cvs-serv20797/library/tools/lace/parser

Modified Files:
	et_lace_parser_skeleton.e 
Log Message:
Fixed bug when computing full pathname of nested clusters.

Index: et_lace_parser_skeleton.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/tools/lace/parser/et_lace_parser_skeleton.e,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** et_lace_parser_skeleton.e	21 Jun 2002 13:24:41 -0000	1.8
--- et_lace_parser_skeleton.e	22 Sep 2002 10:51:18 -0000	1.9
***************
*** 116,119 ****
--- 116,120 ----
  					if nb = 1 then
  						a_full_pathname_string := a_parent_full_pathname
+ 						!! a_full_pathname.make_with_position (a_full_pathname_string, a_pathname.line, a_pathname.column)
  					else
  						inspect a_pathname_string.item (2)
***************
*** 122,130 ****
  							a_full_pathname_string.append_string (a_parent_full_pathname)
  							a_full_pathname_string.append_string (a_pathname_string.substring (2, nb))
  						else
  							a_full_pathname := a_pathname
  						end
  					end
- 					!! a_full_pathname.make_with_position (a_full_pathname_string, a_pathname.line, a_pathname.column)
  				end
  				a_cluster := new_cluster (a_name, a_full_pathname)
--- 123,131 ----
  							a_full_pathname_string.append_string (a_parent_full_pathname)
  							a_full_pathname_string.append_string (a_pathname_string.substring (2, nb))
+ 							!! a_full_pathname.make_with_position (a_full_pathname_string, a_pathname.line, a_pathname.column)
  						else
  							a_full_pathname := a_pathname
  						end
  					end
  				end
  				a_cluster := new_cluster (a_name, a_full_pathname)

Update of /cvsroot/gobo-eiffel/gobo/library/kernel/io
In directory usw-pr-cvs1:/tmp/cvs-serv12476/library/kernel/io

Modified Files:
	ki_character_buffer.e ki_buffer.e 
Log Message:
Feature `item' should be deferred, but there is
a bug with ISE Eiffel 5.1.5 and 5.2 in the generated
C code in finalized mode. So, having this
routine effective is a workaround.

Index: ki_character_buffer.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/kernel/io/ki_character_buffer.e,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ki_character_buffer.e	27 Aug 2002 16:42:55 -0000	1.7
--- ki_character_buffer.e	20 Sep 2002 21:36:50 -0000	1.8
***************
*** 17,21 ****
  	KI_BUFFER [CHARACTER]
  		undefine
! 			put
  		redefine
  			fill_from_stream
--- 17,21 ----
  	KI_BUFFER [CHARACTER]
  		undefine
! 			put, item
  		redefine
  			fill_from_stream

Index: ki_buffer.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/kernel/io/ki_buffer.e,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ki_buffer.e	6 Apr 2002 16:09:17 -0000	1.6
--- ki_buffer.e	20 Sep 2002 21:36:50 -0000	1.7
***************
*** 20,24 ****
  			i_large_enough: i >= 1
  			i_small_enough: i <= count
! 		deferred
  		end
  
--- 20,28 ----
  			i_large_enough: i >= 1
  			i_small_enough: i <= count
! 		do
! 			-- TODO: This routine should be deferred, but there is
! 			-- a bug with ISE Eiffel 5.1.5 and 5.2 in the generated
! 			-- C code in finalized mode, and having this
! 			-- routine effective is a workaround.
  		end
  
***************
*** 41,45 ****
  		do
  			-- TODO: This routine should be deferred, but there is
! 			-- a bug with ISE Eiffel 5.1.5 in the generated
  			-- C code in finalized mode, and having this
  			-- routine effective is a workaround.
--- 45,49 ----
  		do
  			-- TODO: This routine should be deferred, but there is
! 			-- a bug with ISE Eiffel 5.1.5 and 5.2 in the generated
  			-- C code in finalized mode, and having this
  			-- routine effective is a workaround.

Update of /cvsroot/gobo-eiffel/gobo/library/lexical/skeleton
In directory usw-pr-cvs1:/tmp/cvs-serv9865/lexical/skeleton

Modified Files:
	yy_buffer.e yy_file_buffer.e yy_scanner_skeleton.e 
Log Message:
Change KL_CHARACTER_BUFFER to KI_CHARACTER_BUFFER.
Default it still creates a KL_CHARACTER_BUFFER.


Index: yy_buffer.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/lexical/skeleton/yy_buffer.e,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** yy_buffer.e	7 May 2002 13:33:25 -0000	1.17
--- yy_buffer.e	20 Sep 2002 10:23:07 -0000	1.18
***************
*** 29,33 ****
  		do
  			nb := str.count + 2
! 			!! buff.make (nb)
  			buff.fill_from_string (str, 1)
  			buff.put (End_of_buffer_character, nb - 1)
--- 29,33 ----
  		do
  			nb := str.count + 2
! 			!KL_CHARACTER_BUFFER! buff.make (nb)
  			buff.fill_from_string (str, 1)
  			buff.put (End_of_buffer_character, nb - 1)
***************
*** 79,83 ****
  		end
  
! 	content: KL_CHARACTER_BUFFER
  			-- Input buffer characters
  
--- 79,83 ----
  		end
  
! 	content: KI_CHARACTER_BUFFER
  			-- Input buffer characters
  

Index: yy_file_buffer.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/lexical/skeleton/yy_file_buffer.e,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** yy_file_buffer.e	7 May 2002 13:33:25 -0000	1.21
--- yy_file_buffer.e	20 Sep 2002 10:23:07 -0000	1.22
***************
*** 40,44 ****
  			beginning_of_line: beginning_of_line
  		end
! 		
  	make_with_size (a_file: like file; size: INTEGER) is
  			-- Create a new buffer of capacity `size' for `a_file'.
--- 40,44 ----
  			beginning_of_line: beginning_of_line
  		end
! 
  	make_with_size (a_file: like file; size: INTEGER) is
  			-- Create a new buffer of capacity `size' for `a_file'.
***************
*** 52,56 ****
  				-- than the size given because we need to
  				-- put in 2 end-of-buffer characters.
! 			!! content.make (size + 2)
  			set_file (a_file)
  		ensure
--- 52,56 ----
  				-- than the size given because we need to
  				-- put in 2 end-of-buffer characters.
! 			!KL_CHARACTER_BUFFER! content.make (size + 2)
  			set_file (a_file)
  		ensure
***************
*** 161,165 ****
  
  	Read_buffer_capacity: INTEGER is 8192
! 			-- Maximum number of characters to 
  			-- be read at a time
  
--- 161,165 ----
  
  	Read_buffer_capacity: INTEGER is 8192
! 			-- Maximum number of characters to
  			-- be read at a time
  

Index: yy_scanner_skeleton.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/lexical/skeleton/yy_scanner_skeleton.e,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** yy_scanner_skeleton.e	6 Apr 2002 16:17:09 -0000	1.22
--- yy_scanner_skeleton.e	20 Sep 2002 10:23:07 -0000	1.23
***************
*** 165,169 ****
  	more is
  			-- Tell scanner to append the next matched token
! 			-- to current value of `text' instead of 
  			-- replacing it.
  		do
--- 165,169 ----
  	more is
  			-- Tell scanner to append the next matched token
! 			-- to current value of `text' instead of
  			-- replacing it.
  		do
***************
*** 548,552 ****
  			-- Start state
  
! 	yy_content: KL_CHARACTER_BUFFER
  			-- Characters in `input_buffer'
  
--- 548,552 ----
  			-- Start state
  
! 	yy_content: KI_CHARACTER_BUFFER
  			-- Characters in `input_buffer'

Update of /cvsroot/gobo-eiffel/gobo/library/xml/event
In directory usw-pr-cvs1:/tmp/cvs-serv7685/event

Modified Files:
	xm_callbacks.e 
Log Message:
clearer comment

Index: xm_callbacks.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/xml/event/xm_callbacks.e,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** xm_callbacks.e	18 Sep 2002 09:28:49 -0000	1.7
--- xm_callbacks.e	19 Sep 2002 18:38:28 -0000	1.8
***************
*** 95,99 ****
  	on_content (a_content: STRING) is
  			-- Text content.
! 			-- NOT atomic: successive content may be different.
  		require
  			not_void: a_content /= Void
--- 95,100 ----
  	on_content (a_content: STRING) is
  			-- Text content.
! 			-- NOT atomic: two on_content events may follow each other
! 			-- without a markup event in between.
  		require
  			not_void: a_content /= Void

Update of /cvsroot/gobo-eiffel/gobo/library/test/generation
In directory usw-pr-cvs1:/tmp/cvs-serv26236/generation

Modified Files:
	ts_testcases.e 
Log Message:
Removed comments of class 'end' keyword in classes
generated by 'getest'.

Index: ts_testcases.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/test/generation/ts_testcases.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ts_testcases.e	6 Apr 2002 16:26:00 -0000	1.5
--- ts_testcases.e	19 Sep 2002 17:53:11 -0000	1.6
***************
*** 165,170 ****
  				a_file.put_line ("%T%Tend")
  				a_file.put_new_line
! 				a_file.put_string ("end -- class ")
! 				a_file.put_line (new_name)
  				a_file.close
  			else
--- 165,169 ----
  				a_file.put_line ("%T%Tend")
  				a_file.put_new_line
! 				a_file.put_line ("end")
  				a_file.close
  			else
***************
*** 248,253 ****
  				a_file.put_line ("%T%Tend")
  				a_file.put_new_line
! 				a_file.put_string ("end -- class ")
! 				a_file.put_line (upper_class_name)
  				a_file.close
  			else
--- 247,251 ----
  				a_file.put_line ("%T%Tend")
  				a_file.put_new_line
! 				a_file.put_line ("end")
  				a_file.close
  			else

Update of /cvsroot/gobo-eiffel/gobo/doc/xml
In directory usw-pr-cvs1:/tmp/cvs-serv20031

Modified Files:
	using.xml 
Log Message:
added external resolver

Index: using.xml
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/doc/xml/using.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** using.xml	14 Apr 2002 00:47:51 -0000	1.1
--- using.xml	19 Sep 2002 17:35:33 -0000	1.2
***************
*** 127,130 ****
--- 127,146 ----
  </sect1>
  <!-- sect1 DTD events -->
+ <sect1>
+ <title>Resolution of external entities</title>
+ 
+ <para>
+ By default, the parsers do not resolve external entities and produce an error if an external entity or a DTD is used. To use entities, an external resolver must be set, using the parser's <featurename>set_resolver</featurename> routine. This one sets a single resolver for use both for external DTDs and entities, there are routines to set each of these separately.
+ </para>
+ 
+ <para>
+ A resolver is a class that opens a <classname>KI_CHARACTER_INPUT_STREAM</classname> given a system identifier (a string). An error is produced if no corresponding stream can be found. It is the responsability of the client to close the stream.
+ </para>
+ 
+ <para>
+ Default concrete resolvers are provided: <classname>XM_FILE_EXTERNAL_RESOLVER</classname> for using system identifiers as local file names, and <classname>XM_STRING_EXTERNAL_RESOLVER</classname> for resolving in memory using a hash table of strings. Therse is also a null resolver, which the default resolver of a parser.
+ </para>
+ 
+ </sect1>
  
  </chapter>

Update of /cvsroot/gobo-eiffel/gobo/library/xml/event
In directory usw-pr-cvs1:/tmp/cvs-serv11763

Modified Files:
	xm_callbacks_filter.e 
Log Message:
reuse implementation from forward callbacks class

Index: xm_callbacks_filter.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/xml/event/xm_callbacks_filter.e,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** xm_callbacks_filter.e	18 Sep 2002 09:28:49 -0000	1.5
--- xm_callbacks_filter.e	19 Sep 2002 17:10:35 -0000	1.6
***************
*** 21,24 ****
--- 21,32 ----
  			set_callbacks as set_next
  		end
+ 		
+ 	XM_FORWARD_CALLBACKS 
+ 		-- implementation of default behaviour:
+ 		-- forwarding to 'next' processor in chain
+ 		rename
+ 			callbacks as next,
+ 			set_callbacks as set_next
+ 		end
  
  creation
***************
*** 33,136 ****
  		do
  			!XM_CALLBACKS_NULL! next.make
- 		end
- 
- feature -- Chain
- 
- 	set_next (a_callback: XM_CALLBACKS) is
- 			-- Set next callback processor in chain/stream.
- 		do
- 			next := a_callback
- 		ensure then
- 			definition: next = a_callback
- 		end
- 
- 	next: XM_CALLBACKS
- 			-- Next callbacks event consumer
- 
- feature -- Document
- 
- 	on_start is
- 			-- Called when parsing starts.
- 		do
- 			next.on_start
- 		end
- 
- 	on_finish is
- 			-- Called when parsing finished.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_finish
- 		end
- 
- 	on_xml_declaration (a_version: STRING; an_encoding: STRING; a_standalone: BOOLEAN) is
- 			-- XML declaration.
- 		do
- 			next.on_xml_declaration (a_version, an_encoding, a_standalone)
- 		end
- 
- feature -- Errors
- 
- 	on_error (a_message: STRING) is
- 			-- Event producer detected an error.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_error (a_message)
- 		end
- 
- feature -- Meta
- 
- 	on_processing_instruction (a_name: STRING; a_content: STRING) is
- 			-- Processing instruction.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_processing_instruction (a_name, a_content)
- 		end
- 
- 	on_comment (a_content: STRING) is
- 			-- Processing comment.
- 			-- Atomic: single comment produces single event
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_comment (a_content)
- 		end
- 
- feature -- Tag
- 
- 	on_start_tag (a_namespace: STRING; a_prefix: STRING; a_local_part: STRING) is
- 			-- Start of start tag.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_start_tag (a_namespace, a_prefix, a_local_part)
- 		end
- 
- 	on_attribute (a_namespace: STRING; a_prefix: STRING; a_local_part: STRING; a_value: STRING) is
- 			-- Attribute.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_attribute (a_namespace, a_prefix, a_local_part, a_value)
- 		end
- 
- 	on_start_tag_finish is
- 			-- End of start tag.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_start_tag_finish
- 		end
- 
- 	on_end_tag (a_namespace: STRING; a_prefix: STRING; a_local_part: STRING) is
- 			-- End tag.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_end_tag (a_namespace, a_prefix, a_local_part)
- 		end
- 
- feature -- Content
- 
- 	on_content (a_content: STRING) is
- 			-- Text content.
- 			-- NOT atomic: successive content may be different.
- 			-- Default: forward event to 'next'.
- 		do
- 			next.on_content (a_content)
  		end
  
--- 41,44 ----

Update of /cvsroot/gobo-eiffel/gobo/library/xml/parser/eiffel
In directory usw-pr-cvs1:/tmp/cvs-serv5973

Modified Files:
	xm_eiffel_utf16_input_stream.e 
Log Message:
fix marginal cases and clarify code

Index: xm_eiffel_utf16_input_stream.e
===================================================================
RCS file: /cvsroot/gobo-eiffel/gobo/library/xml/parser/eiffel/xm_eiffel_utf16_input_stream.e,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** xm_eiffel_utf16_input_stream.e	3 Sep 2002 19:16:11 -0000	1.2
--- xm_eiffel_utf16_input_stream.e	19 Sep 2002 16:54:57 -0000	1.3
***************
*** 56,83 ****
  	read_character is
  			-- Read the next item in input stream.
! 			-- Make the result available in `last_item'.
  		do
  			if not is_detected then
  				utf16_detect_read_character
  				is_detected := True
! 					-- Detection may eat characters so we do a normal
! 					-- read afterwards, fill queue for normal read.
! 			elseif utf_queue.count > 0 then
! 					-- Last character was read from queue.
! 				utf_queue.remove
! 			end
! 				-- If `utf_queue' still contains something,
! 				-- this is the next character, so do nothing.
! 			if utf_queue.count = 0 then
! 					-- Otherwise we read via our routine if we 
! 					-- are in a UTF16 file otherwise leave it to
! 					-- parent.
! 				if is_utf16 then
! 					utf16_read_character
  				else
! 					impl.read_character
  				end
! 			end
  		end
  
  	read_string (nb: INTEGER) is
--- 56,107 ----
  	read_character is
  			-- Read the next item in input stream.
! 			-- Make the result available in `last_character'.
  		do
+ 			-- see 'last_character': it chooses from impl or the queue
+ 			
  			if not is_detected then
  				utf16_detect_read_character
  				is_detected := True
! 				
! 				-- If detection has not put back read character in queue, 
! 				-- read from upstream, which may be empty if the stream 
! 				-- contains only the byte order character.
! 				if utf_queue.count = 0 and not impl.end_of_input then
! 					noqueue_read_character
! 				end	
! 			else
! 				if utf_queue.count > 0 then
! 					-- Last character was read from queue, remove it.
! 					utf_queue.remove
! 					-- Next character may or may not be from queue.
! 					if utf_queue.count = 0 and not impl.end_of_input then
! 						noqueue_read_character
! 					end
  				else
! 					-- Straightforward case.
! 					noqueue_read_character
  				end
! 			end				
! 		end
! 		
! feature {NONE} -- Input
! 
! 	noqueue_read_character is
! 			-- Read character after detection and when detection queue has 
! 			-- been flushed..
! 		require
! 			open_read: is_open_read
! 			not_end: not end_of_input
! 			detected: is_detected
! 			queue_empty: utf_queue.count = 0
! 		do
! 			if is_utf16 then
! 				utf16_read_character
! 			else
! 				impl.read_character
! 			end	
  		end
+ 		
+ feature -- Input
  
  	read_string (nb: INTEGER) is
***************
*** 96,101 ****
  			from
  				last_string.wipe_out
- 				i := nb
  				read_character
  			until
  				i = 0 or end_of_input
--- 120,125 ----
  			from
  				last_string.wipe_out
  				read_character
+ 				i := nb
  			until
  				i = 0 or end_of_input
***************
*** 208,211 ****
--- 232,237 ----
  						utf_queue.force (second_char)
  					end
+ 				else
+ 					utf_queue.force (first_char)
  				end
  			end
***************
*** 281,287 ****
  		do
  			debug ("xml_parser")
! 				std.output.put_string ("[")
! 				std.output.put_string (a_char.out)
! 				std.output.put_string ("]")
  			end
  				-- Convert to UTF8
--- 307,313 ----
  		do
  			debug ("xml_parser")
! 				std.error.put_string ("[")
! 				std.error.put_string (a_char.out)
! 				std.error.put_string ("]")
  			end
  				-- Convert to UTF8