Mercurial > hg > truffle
changeset 2550:d9b2a8653054
Enabled checkstyle for the GraalGraph project. Fixed checkstyle errors. Set correct code formatter.
| author | Thomas Wuerthinger <thomas@wuerthinger.net> |
|---|---|
| date | Wed, 27 Apr 2011 22:13:30 +0200 |
| parents | c12715ca2cc7 |
| children | 550b291f56c4 9db994445118 |
| files | graal/GraalGraph/.checkstyle graal/GraalGraph/.project graal/GraalGraph/.settings/org.eclipse.jdt.core.prefs graal/GraalGraph/.settings/org.eclipse.jdt.ui.prefs graal/GraalGraph/src/com/oracle/graal/graph/Graph.java graal/GraalGraph/src/com/oracle/graal/graph/Node.java graal/GraalGraph/src/com/oracle/graal/graph/NullNode.java graal/GraalGraph/test/com/oracle/graal/graph/NodeTest.java |
| diffstat | 8 files changed, 538 insertions(+), 228 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/GraalGraph/.checkstyle Wed Apr 27 22:13:30 2011 +0200 @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false"> + <local-check-config name="C1X Checkstyle checks" location="/GraalCompiler/.checkstyle_checks.xml" type="project" description=""> + <additional-data name="protect-config-file" value="false"/> + </local-check-config> + <fileset name="all" enabled="true" check-config-name="C1X Checkstyle checks" local="true"> + <file-match-pattern match-pattern="." include-pattern="true"/> + </fileset> +</fileset-config>
--- a/graal/GraalGraph/.project Wed Apr 27 22:07:20 2011 +0200 +++ b/graal/GraalGraph/.project Wed Apr 27 22:13:30 2011 +0200 @@ -1,17 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>GraalGraph</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>GraalGraph</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>net.sf.eclipsecs.core.CheckstyleBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> + </natures> +</projectDescription>
--- a/graal/GraalGraph/.settings/org.eclipse.jdt.core.prefs Wed Apr 27 22:07:20 2011 +0200 +++ b/graal/GraalGraph/.settings/org.eclipse.jdt.core.prefs Wed Apr 27 22:13:30 2011 +0200 @@ -1,12 +1,270 @@ -#Wed Apr 27 16:04:34 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +#Wed Apr 27 22:10:44 CEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=0 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=true +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=120 +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=4 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4 +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true +org.eclipse.jdt.core.formatter.indentation.size=8 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=200 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/GraalGraph/.settings/org.eclipse.jdt.ui.prefs Wed Apr 27 22:13:30 2011 +0200 @@ -0,0 +1,4 @@ +#Wed Apr 27 22:10:44 CEST 2011 +eclipse.preferences.version=1 +formatter_profile=_C1XJavaCodeStyle +formatter_settings_version=11
--- a/graal/GraalGraph/src/com/oracle/graal/graph/Graph.java Wed Apr 27 22:07:20 2011 +0200 +++ b/graal/GraalGraph/src/com/oracle/graal/graph/Graph.java Wed Apr 27 22:13:30 2011 +0200 @@ -27,26 +27,28 @@ import java.util.Collections; public class Graph { - private final ArrayList<Node> nodes; - private int nextId; - - public Graph() { - nodes = new ArrayList<Node>(); - } + + private final ArrayList<Node> nodes; + private int nextId; + + public Graph() { + nodes = new ArrayList<Node>(); + } - public synchronized int nextId(Node node) { - int id = nextId++; - nodes.add(id, node); - return id; - } - - public Collection<Node> getNodes(){ - return Collections.unmodifiableCollection(nodes); - } - - public Node local(Node node) { - if(node.getGraph() == this) - return node; - return node.cloneNode(this); - } + public synchronized int nextId(Node node) { + int id = nextId++; + nodes.add(id, node); + return id; + } + + public Collection<Node> getNodes() { + return Collections.unmodifiableCollection(nodes); + } + + public Node local(Node node) { + if (node.getGraph() == this) { + return node; + } + return node.cloneNode(this); + } }
--- a/graal/GraalGraph/src/com/oracle/graal/graph/Node.java Wed Apr 27 22:07:20 2011 +0200 +++ b/graal/GraalGraph/src/com/oracle/graal/graph/Node.java Wed Apr 27 22:13:30 2011 +0200 @@ -29,154 +29,162 @@ import java.util.Iterator; public abstract class Node { - private final Graph graph; - private final int id; - private final NodeArray inputs; - private final NodeArray successors; - private final ArrayList<Node> usages; - private final ArrayList<Node> predecessors; - - public Node(Node[] inputs, Node[] successors, Graph graph) { - this.graph = graph; - if(graph != null) { - this.id = graph.nextId(this); //this pointer escaping in a constructor.. - }else { - this.id = -1; - } - this.inputs = new NodeArray(inputs); - this.successors = new NodeArray(successors); - this.predecessors = new ArrayList<Node>(); - this.usages = new ArrayList<Node>(); - } - - public Node(int inputs, int successors, Graph graph) { - this(nullNodes(inputs, graph), nullNodes(successors, graph), graph); - } - - public class NodeArray implements Iterable<Node>{ - private final Node[] nodes; - - public NodeArray(Node[] nodes) { - this.nodes = nodes; - } - - @Override - public Iterator<Node> iterator() { - return Arrays.asList(this.nodes).iterator(); - } - - public Node set(int index, Node node) { - if(node.graph != Node.this.graph) { - // fail ? - } - Node old = nodes[index]; - nodes[index] = node; - if(Node.this.inputs == this) { // :-/ - old.usages.remove(Node.this); - node.usages.add(Node.this); - }else /*if(Node.this.successors == this)*/{ - old.predecessors.remove(Node.this); - node.predecessors.add(Node.this); - } - - return old; - } - - public boolean contains(Node n) { - for(int i = 0; i < nodes.length; i++) - if(nodes[i] == n) //equals? - return true; - return false; - } - - public boolean replace(Node toReplace, Node replacement) { - for(int i = 0; i < nodes.length; i++) { - if(nodes[i] == toReplace) { // equals? - this.set(i, replacement); - return true; //replace only one occurrence - } - } - return false; - } - - public Node[] asArray() { - Node[] copy = new Node[nodes.length]; - System.arraycopy(nodes, 0, copy, 0, nodes.length); - return copy; - } - } - - public Collection<Node> getPredecessors() { - return Collections.unmodifiableCollection(predecessors); - } - - public Collection<Node> getUsages() { - return Collections.unmodifiableCollection(usages); - } - - public NodeArray getInputs() { - return inputs; - } - - public NodeArray getSuccessors() { - return successors; - } - - public int getId() { - return id; - } - - public Graph getGraph() { - return graph; - } - - public void replace(Node other) { - if(other.graph != this.graph) { - other = other.cloneNode(this.graph); - } - Node[] myInputs = inputs.nodes; - for(int i = 0; i < myInputs.length; i++) { - other.inputs.set(i, myInputs[i]); - } - for(Node usage : usages) { - usage.inputs.replace(this, other); - } - - Node[] mySuccessors = successors.nodes; - for(int i = 0; i < mySuccessors.length; i++) { - other.successors.set(i, mySuccessors[i]); - } - for(Node predecessor : predecessors) { - predecessor.successors.replace(this, other); - } - } - - public abstract Node cloneNode(Graph into); + + private final Graph graph; + private final int id; + private final NodeArray inputs; + private final NodeArray successors; + private final ArrayList<Node> usages; + private final ArrayList<Node> predecessors; + + public Node(Node[] inputs, Node[] successors, Graph graph) { + this.graph = graph; + if (graph != null) { + this.id = graph.nextId(this); // this pointer escaping in a constructor.. + } else { + this.id = -1; + } + this.inputs = new NodeArray(inputs); + this.successors = new NodeArray(successors); + this.predecessors = new ArrayList<Node>(); + this.usages = new ArrayList<Node>(); + } + + public Node(int inputs, int successors, Graph graph) { + this(nullNodes(inputs, graph), nullNodes(successors, graph), graph); + } + + public class NodeArray implements Iterable<Node> { + + private final Node[] nodes; + + public NodeArray(Node[] nodes) { + this.nodes = nodes; + } + + @Override + public Iterator<Node> iterator() { + return Arrays.asList(this.nodes).iterator(); + } + + public Node set(int index, Node node) { + if (node.graph != Node.this.graph) { + // fail ? + } + Node old = nodes[index]; + nodes[index] = node; + if (Node.this.inputs == this) { // :-/ + old.usages.remove(Node.this); + node.usages.add(Node.this); + } else { + assert Node.this.successors == this; + old.predecessors.remove(Node.this); + node.predecessors.add(Node.this); + } + + return old; + } + + public boolean contains(Node n) { + for (int i = 0; i < nodes.length; i++) { + if (nodes[i] == n) { // equals? + return true; + } + } + return false; + } + + public boolean replace(Node toReplace, Node replacement) { + for (int i = 0; i < nodes.length; i++) { + if (nodes[i] == toReplace) { // equals? + this.set(i, replacement); + return true; // replace only one occurrence + } + } + return false; + } - @Override - public boolean equals(Object obj) { - if(obj == this) - return true; - if(obj.getClass() == this.getClass()) { - Node other = (Node)obj; - if(other.id == this.id && other.graph == this.graph) - return true; - } - return false; - } - - protected Node getInput(int index) { - return this.inputs.nodes[index]; - } - - protected Node getSuccessor(int index) { - return this.successors.nodes[index]; - } + public Node[] asArray() { + Node[] copy = new Node[nodes.length]; + System.arraycopy(nodes, 0, copy, 0, nodes.length); + return copy; + } + } + + public Collection<Node> getPredecessors() { + return Collections.unmodifiableCollection(predecessors); + } + + public Collection<Node> getUsages() { + return Collections.unmodifiableCollection(usages); + } + + public NodeArray getInputs() { + return inputs; + } + + public NodeArray getSuccessors() { + return successors; + } + + public int getId() { + return id; + } + + public Graph getGraph() { + return graph; + } - private static Node[] nullNodes(int number, Graph graph) { - Node[] nodes = new Node[number]; - for(int i = 0; i < number; i++) - nodes[i] = new NullNode(0, 0, graph); - return nodes; - } + public void replace(Node other) { + if (other.graph != this.graph) { + other = other.cloneNode(this.graph); + } + Node[] myInputs = inputs.nodes; + for (int i = 0; i < myInputs.length; i++) { + other.inputs.set(i, myInputs[i]); + } + for (Node usage : usages) { + usage.inputs.replace(this, other); + } + + Node[] mySuccessors = successors.nodes; + for (int i = 0; i < mySuccessors.length; i++) { + other.successors.set(i, mySuccessors[i]); + } + for (Node predecessor : predecessors) { + predecessor.successors.replace(this, other); + } + } + + public abstract Node cloneNode(Graph into); + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (obj.getClass() == this.getClass()) { + Node other = (Node) obj; + if (other.id == this.id && other.graph == this.graph) { + return true; + } + } + return false; + } + + protected Node getInput(int index) { + return this.inputs.nodes[index]; + } + + protected Node getSuccessor(int index) { + return this.successors.nodes[index]; + } + + private static Node[] nullNodes(int number, Graph graph) { + Node[] nodes = new Node[number]; + for (int i = 0; i < number; i++) { + nodes[i] = new NullNode(0, 0, graph); + } + return nodes; + } }
--- a/graal/GraalGraph/src/com/oracle/graal/graph/NullNode.java Wed Apr 27 22:07:20 2011 +0200 +++ b/graal/GraalGraph/src/com/oracle/graal/graph/NullNode.java Wed Apr 27 22:13:30 2011 +0200 @@ -24,13 +24,12 @@ public class NullNode extends Node { - public NullNode(int inputs, int successors, Graph graph) { - super(inputs, successors, graph); - } + public NullNode(int inputs, int successors, Graph graph) { + super(inputs, successors, graph); + } - @Override - public NullNode cloneNode(Graph into) { - return new NullNode(0, 0, into); - } - + @Override + public NullNode cloneNode(Graph into) { + return new NullNode(0, 0, into); + } }
--- a/graal/GraalGraph/test/com/oracle/graal/graph/NodeTest.java Wed Apr 27 22:07:20 2011 +0200 +++ b/graal/GraalGraph/test/com/oracle/graal/graph/NodeTest.java Wed Apr 27 22:13:30 2011 +0200 @@ -1,3 +1,25 @@ +/* + * Copyright (c) 2011, 2011, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ package com.oracle.graal.graph; import static org.junit.Assert.*; @@ -6,29 +28,30 @@ public class NodeTest { - @Test - public void testReplace() { - DummyNode n1 = new DummyNode(2, 1, null); - - Graph g1 = new Graph(); - - DummyNode n2 = new DummyNode(1, 1, g1); - } + @Test + public void testReplace() { + DummyNode n1 = new DummyNode(2, 1, null); + + Graph g1 = new Graph(); + + DummyNode n2 = new DummyNode(1, 1, g1); + assertNotSame(n1, n2); + } + + private static class DummyNode extends Node { - private static class DummyNode extends Node{ - - public DummyNode(int inputs, int successors, Graph graph) { - super(inputs, successors, graph); - } + public DummyNode(int inputs, int successors, Graph graph) { + super(inputs, successors, graph); + } + + public DummyNode(Node[] inputs, Node[] successors, Graph graph) { + super(inputs, successors, graph); + } - public DummyNode(Node[] inputs, Node[] successors, Graph graph) { - super(inputs, successors, graph); - } + @Override + public Node cloneNode(Graph into) { + return new DummyNode(this.getInputs().asArray(), this.getSuccessors().asArray(), into); + } - @Override - public Node cloneNode(Graph into) { - return new DummyNode(this.getInputs().asArray(), this.getSuccessors().asArray(), into); - } - - } + } }