Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small convenience improvements for Instrumentation API #24

Closed
wants to merge 2 commits into from
Closed

Small convenience improvements for Instrumentation API #24

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd8bd1
Add SourceSection.cloneWithTags(.)
smarr Jan 29, 2016
3a51395
Add tags to SourceSection.toString()
smarr Jan 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/source/SourceSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
*/
package com.oracle.truffle.api.source;

import java.util.Arrays;

/**
* Description of contiguous section of text within a {@link Source} of program code; supports
* multiple modes of access to the text and its location. A special
Expand Down Expand Up @@ -229,12 +231,17 @@ public String getShortDescription() {
*/
@Override
public String toString() {
String result;
if (source == null) {
return kind + ": " + identifier;
result = kind + ": " + identifier;
} else {
return "source=" + source.getShortName() + " pos=" + charIndex + " len=" + charLength + " line=" + startLine + " col=" + startColumn +
result = "source=" + source.getShortName() + " pos=" + charIndex + " len=" + charLength + " line=" + startLine + " col=" + startColumn +
(identifier != null ? " identifier=" + identifier : "") + " code=" + getCode();
}
if (tags != null && tags.length > 0) {
result += " tags: " + Arrays.toString(tags);
}
return result;
}

@Override
Expand Down Expand Up @@ -291,6 +298,16 @@ public boolean equals(Object obj) {
return true;
}

/**
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing Javadoc.

* @param newTags is a new set of tags
* @return copy with the provided tags set
*/
public SourceSection cloneWithTags(String... newTags) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

withTags(...) is more consistent with naming used in this package (see Source#withMimeType).

assert tagsAreNonNullAndInterned(newTags);
return new SourceSection(kind, source, identifier, startLine,
startColumn, charIndex, charLength, newTags);
}

/**
* Placeholder for source that is unavailable, e.g. for language <em>builtins</em>. The
* <code>SourceSection</code> created by this method returns <code>null</code> when queried for
Expand Down