conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import org.rstudio.studio.client.workbench.views.source.model.CppCompletion;
=======
import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.ChunkIconsManager;
import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.SetupChunkOptionsPopupPanel;
import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.TextEditingTargetNotebook;
>>>>>>>
import org.rstudio.studio.client.workbench.views.source.model.CppCompletion;
import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.ChunkIconsManager;
import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.SetupChunkOptionsPopupPanel;
import org.rstudio.studio.client.workbench.views.source.editors.text.rmd.TextEditingTargetNotebook; |
<<<<<<<
import org.rstudio.studio.client.workbench.views.source.SourceColumn;
=======
import org.rstudio.studio.client.workbench.views.source.editors.EditingTargetSource.EditingTargetNameProvider;
>>>>>>>
import org.rstudio.studio.client.workbench.views.source.SourceColumn;
import org.rstudio.studio.client.workbench.views.source.editors.EditingTargetSource.EditingTargetNameProvider; |
<<<<<<<
import org.rstudio.studio.client.application.ui.RTimeoutOptions;
=======
import org.rstudio.studio.client.application.ui.LauncherSessionStatus;
>>>>>>>
import org.rstudio.studio.client.application.ui.RTimeoutOptions;
import org.rstudio.studio.client.application.ui.LauncherSessionStatus;
<<<<<<<
rTimeoutOptions_,
dismissProgressAnimation_);
=======
dismissProgressAnimation_,
connectionStatusCallback);
>>>>>>>
rTimeoutOptions_,
dismissProgressAnimation_,
connectionStatusCallback); |
<<<<<<<
public static final String TerminalBusy = "terminal_busy";
public static final String PackageExtensionIndexingCompleted = "package_extension_indexing_completed";
=======
public static final String TerminalSubProcs = "terminal_subprocs";
>>>>>>>
public static final String TerminalBusy = "terminal_busy";
public static final String PackageExtensionIndexingCompleted = "package_extension_indexing_completed";
public static final String TerminalSubProcs = "terminal_subprocs"; |
<<<<<<<
@Override
public boolean getShowInternalFunctions()
{
return prefs_.showInternalFunctionsInTraceback().getValue();
}
@Override
public void setShowInternalFunctions(boolean show)
{
prefs_.showInternalFunctionsInTraceback().setProjectValue(show);
}
=======
public void fillObjectContents(final RObject object,
final Operation onCompleted)
{
server_.getObjectContents(object.getName(),
new ServerRequestCallback<ObjectContents>()
{
@Override
public void onResponseReceived(ObjectContents contents)
{
object.setDeferredContents(contents.getContents());
onCompleted.execute();
}
@Override
public void onError(ServerError error)
{
onCompleted.execute();
}
});
}
>>>>>>>
@Override
public boolean getShowInternalFunctions()
{
return prefs_.showInternalFunctionsInTraceback().getValue();
}
@Override
public void setShowInternalFunctions(boolean show)
{
prefs_.showInternalFunctionsInTraceback().setProjectValue(show);
}
public void fillObjectContents(final RObject object,
final Operation onCompleted)
{
server_.getObjectContents(object.getName(),
new ServerRequestCallback<ObjectContents>()
{
@Override
public void onResponseReceived(ObjectContents contents)
{
object.setDeferredContents(contents.getContents());
onCompleted.execute();
}
@Override
public void onError(ServerError error)
{
onCompleted.execute();
}
});
} |
<<<<<<<
void injectMembers(TextEditingTargetNotebook notebook);
=======
void injectMembers(WindowFrame frame);
>>>>>>>
void injectMembers(TextEditingTargetNotebook notebook);
void injectMembers(WindowFrame frame); |
<<<<<<<
private Integer minValue_;
private Integer maxValue_;
=======
private final Integer minValue_;
private final Integer maxValue_;
private final String label_;
>>>>>>>
private Integer minValue_;
private Integer maxValue_;
private String label_; |
<<<<<<<
public static final String ProjectTemplateRegistryUpdated = "project_template_registry_updated";
=======
public static final String NavigateShinyFrame = "navigate_shiny_frame";
public static final String UpdateNewConnectionDialog = "update_new_connection_dialog";
public static final String TerminalBusy = "terminal_busy";
>>>>>>>
public static final String NavigateShinyFrame = "navigate_shiny_frame";
public static final String UpdateNewConnectionDialog = "update_new_connection_dialog";
public static final String ProjectTemplateRegistryUpdated = "project_template_registry_updated";
public static final String TerminalBusy = "terminal_busy"; |
<<<<<<<
// the byte buffer has the extra byte, but should not be able to read it...
final UnsynchronizedBuffer.Reader ub2 = ub;
final byte[] buf2 = buf;
assertThrows(ArrayIndexOutOfBoundsException.class, () -> ub2.readBytes(buf2));
=======
final UnsynchronizedBuffer.Reader finalUb = ub;
final byte[] finalBuf = buf;
assertThrows("the byte buffer has the extra byte, but should not be able to read it",
ArrayIndexOutOfBoundsException.class, () -> finalUb.readBytes(finalBuf));
>>>>>>>
// the byte buffer has the extra byte, but should not be able to read it...
final UnsynchronizedBuffer.Reader finalUb = ub;
final byte[] finalBuf = buf;
assertThrows(ArrayIndexOutOfBoundsException.class, () -> finalUb.readBytes(finalBuf)); |
<<<<<<<
import org.rstudio.studio.client.common.vcs.StatusAndPathInfo;
import org.rstudio.studio.client.common.vcs.VCSConstants;
import org.rstudio.studio.client.workbench.model.Session;
import org.rstudio.studio.client.workbench.model.SessionInfo;
=======
import org.rstudio.studio.client.common.vcs.StatusAndPathInfo;
import org.rstudio.studio.client.common.vcs.VCSConstants;
import org.rstudio.studio.client.workbench.model.Session;
>>>>>>>
import org.rstudio.studio.client.common.vcs.StatusAndPathInfo;
import org.rstudio.studio.client.common.vcs.VCSConstants;
import org.rstudio.studio.client.workbench.model.Session;
import org.rstudio.studio.client.workbench.model.SessionInfo;
<<<<<<<
public enum IncludeFilePatterns
{
AllFiles,
CommonRSourceFiles,
RScripts,
Package,
CustomFilter
}
public enum ExcludeFilePatterns
{
None,
StandardGit,
CustomFilter
}
=======
public enum IncludeFilePatterns
{
AllFiles,
CommonRSourceFiles,
RScripts,
CustomFilter
}
public enum ExcludeFilePatterns
{
None,
StandardGit,
CustomFilter
}
>>>>>>>
public enum IncludeFilePatterns
{
AllFiles,
CommonRSourceFiles,
RScripts,
Package,
CustomFilter
}
public enum ExcludeFilePatterns
{
None,
StandardGit,
CustomFilter
}
<<<<<<<
public DirectoryChooserTextBox getDirectoryChooser()
{
return dirChooser_;
}
public void setGitStatus(boolean status)
{
gitStatus_ = status;
manageExcludeFilePattern();
}
public void setPackageStatus(boolean status)
{
packageStatus_ = status;
manageFilePattern();
}
=======
public DirectoryChooserTextBox getDirectoryChooser()
{
return dirChooser_;
}
public void setGitStatus(boolean status)
{
gitStatus_ = status;
manageExcludeFilePattern();
}
>>>>>>>
public DirectoryChooserTextBox getDirectoryChooser()
{
return dirChooser_;
}
public void setGitStatus(boolean status)
{
gitStatus_ = status;
manageExcludeFilePattern();
}
public void setPackageStatus(boolean status)
{
packageStatus_ = status;
manageFilePattern();
}
<<<<<<<
// disable 'Standard Git exclusions' when directory is not a git repository
// or git is not installed
// this should come first as it may change the value of listPresetExcludeFilePatterns
if (!gitStatus_ ||
!session_.getSessionInfo().isVcsAvailable(VCSConstants.GIT_ID))
{
((Element) listPresetExcludeFilePatterns_.getElement().getChild(
ExcludeFilePatterns.StandardGit.ordinal()))
.setAttribute("disabled", "disabled");
if (listPresetExcludeFilePatterns_.getSelectedIndex() ==
ExcludeFilePatterns.StandardGit.ordinal())
listPresetExcludeFilePatterns_.setSelectedIndex(ExcludeFilePatterns.None.ordinal());
}
else
((Element) listPresetExcludeFilePatterns_.getElement().getChild(
ExcludeFilePatterns.StandardGit.ordinal())).removeAttribute("disabled");
// disable custom filter text box when 'Custom Filter' is not selected
=======
// disable 'Standard Git exclusions' when directory is not a git repository
// or git is not installed
// this should come first as it may change the value of listPresetExcludeFilePatterns
if (!gitStatus_ ||
!session_.getSessionInfo().isVcsAvailable(VCSConstants.GIT_ID))
{
((Element) listPresetExcludeFilePatterns_.getElement().getChild(1))
.setAttribute("disabled", "disabled");
if (listPresetExcludeFilePatterns_.getSelectedIndex() ==
ExcludeFilePatterns.StandardGit.ordinal())
listPresetExcludeFilePatterns_.setSelectedIndex(ExcludeFilePatterns.None.ordinal());
}
else
((Element) listPresetExcludeFilePatterns_.getElement().getChild(1))
.removeAttribute("disabled");
// disable custom filter text box when 'Custom Filter' is not selected
>>>>>>>
// disable 'Standard Git exclusions' when directory is not a git repository
// or git is not installed
// this should come first as it may change the value of listPresetExcludeFilePatterns
if (!gitStatus_ ||
!session_.getSessionInfo().isVcsAvailable(VCSConstants.GIT_ID))
{
((Element) listPresetExcludeFilePatterns_.getElement().getChild(
ExcludeFilePatterns.StandardGit.ordinal()))
.setAttribute("disabled", "disabled");
if (listPresetExcludeFilePatterns_.getSelectedIndex() ==
ExcludeFilePatterns.StandardGit.ordinal())
listPresetExcludeFilePatterns_.setSelectedIndex(ExcludeFilePatterns.None.ordinal());
}
else
((Element) listPresetExcludeFilePatterns_.getElement().getChild(
ExcludeFilePatterns.StandardGit.ordinal())).removeAttribute("disabled");
// disable custom filter text box when 'Custom Filter' is not selected
<<<<<<<
// user cannot specify include patterns when using git grep
if (listPresetExcludeFilePatterns_.getSelectedIndex() !=
ExcludeFilePatterns.StandardGit.ordinal())
{
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CommonRSourceFiles.ordinal())).removeAttribute("disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.RScripts.ordinal())).removeAttribute("disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CustomFilter.ordinal())).removeAttribute("disabled");
}
else
{
// when using standard git exclusions we don't have the option to search recursively and
// specify file types
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CommonRSourceFiles.ordinal()))
.setAttribute("disabled", "disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.RScripts.ordinal()))
.setAttribute("disabled", "disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CustomFilter.ordinal()))
.setAttribute("disabled", "disabled");
// if a disabled index is selected, change it to All Files
if (listPresetFilePatterns_.getSelectedIndex() ==
IncludeFilePatterns.CommonRSourceFiles.ordinal() ||
listPresetFilePatterns_.getSelectedIndex() ==
IncludeFilePatterns.RScripts.ordinal() ||
listPresetFilePatterns_.getSelectedIndex() ==
IncludeFilePatterns.CustomFilter.ordinal())
listPresetFilePatterns_.setSelectedIndex(IncludeFilePatterns.AllFiles.ordinal());
manageFilePattern();
}
=======
// user cannot specify include patterns when using git grep
if (listPresetExcludeFilePatterns_.getSelectedIndex() !=
ExcludeFilePatterns.StandardGit.ordinal())
listPresetFilePatterns_.setEnabled(true);
else
{
listPresetFilePatterns_.setEnabled(false);
listPresetFilePatterns_.setSelectedIndex(IncludeFilePatterns.AllFiles.ordinal());
manageFilePattern();
}
>>>>>>>
// user cannot specify include patterns when using git grep
if (listPresetExcludeFilePatterns_.getSelectedIndex() !=
ExcludeFilePatterns.StandardGit.ordinal())
{
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CommonRSourceFiles.ordinal())).removeAttribute("disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.RScripts.ordinal())).removeAttribute("disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CustomFilter.ordinal())).removeAttribute("disabled");
}
else
{
// when using standard git exclusions we don't have the option to search recursively and
// specify file types
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CommonRSourceFiles.ordinal()))
.setAttribute("disabled", "disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.RScripts.ordinal()))
.setAttribute("disabled", "disabled");
((Element) listPresetFilePatterns_.getElement().getChild(
IncludeFilePatterns.CustomFilter.ordinal()))
.setAttribute("disabled", "disabled");
// if a disabled index is selected, change selection to All Files
if (listPresetFilePatterns_.getSelectedIndex() ==
IncludeFilePatterns.CommonRSourceFiles.ordinal() ||
listPresetFilePatterns_.getSelectedIndex() ==
IncludeFilePatterns.RScripts.ordinal() ||
listPresetFilePatterns_.getSelectedIndex() ==
IncludeFilePatterns.CustomFilter.ordinal())
listPresetFilePatterns_.setSelectedIndex(IncludeFilePatterns.AllFiles.ordinal());
manageFilePattern();
}
<<<<<<<
String filePatterns =
listPresetFilePatterns_.getValue(
listPresetFilePatterns_.getSelectedIndex());
if (filePatterns == "custom")
filePatterns = txtFilePattern_.getText();
=======
String includeFilePatterns =
listPresetFilePatterns_.getValue(
listPresetFilePatterns_.getSelectedIndex());
if (includeFilePatterns == "custom")
includeFilePatterns = txtFilePattern_.getText();
>>>>>>>
String includeFilePatterns =
listPresetFilePatterns_.getValue(
listPresetFilePatterns_.getSelectedIndex());
if (includeFilePatterns == "custom")
includeFilePatterns = txtFilePattern_.getText();
<<<<<<<
// indexes refer to corresponding enums, but left as ints for readability
String filePatterns = StringUtil.join(
=======
// indexes refer to corresponding enums, but left as ints for readability
String includeFilePatterns = StringUtil.join(
>>>>>>>
// indexes refer to corresponding enums, but left as ints for readability
String includeFilePatterns = StringUtil.join(
<<<<<<<
else
listPresetFilePatterns_.setSelectedIndex(4);
txtFilePattern_.setText(filePatterns);
=======
txtFilePattern_.setText(includeFilePatterns);
>>>>>>>
else
listPresetFilePatterns_.setSelectedIndex(4);
txtFilePattern_.setText(includeFilePatterns);
<<<<<<<
private boolean gitStatus_;
private boolean packageStatus_;
=======
private boolean gitStatus_;
>>>>>>>
private boolean gitStatus_;
private boolean packageStatus_; |
<<<<<<<
bind(JobManager.class).asEagerSingleton();
=======
bind(HtmlMessageListener.class).asEagerSingleton();
>>>>>>>
bind(JobManager.class).asEagerSingleton();
bind(HtmlMessageListener.class).asEagerSingleton(); |
<<<<<<<
if (sigTip_ != null)
sigTip_.previewKeyPress(c);
=======
// Bail if we're not in R mode
if (!isCursorInRMode())
return false;
>>>>>>>
if (sigTip_ != null)
sigTip_.previewKeyPress(c);
// Bail if we're not in R mode
if (!isCursorInRMode())
return false; |
<<<<<<<
displayPanel.add(checkboxPref("Show R chunk execution output within editor", prefs_.showRmdChunkOutputInline()));
=======
displayPanel.add(checkboxPref("Show document outline by default", prefs_.showDocumentOutlineRmd()));
>>>>>>>
displayPanel.add(checkboxPref("Show R chunk execution output within editor", prefs_.showRmdChunkOutputInline()));
displayPanel.add(checkboxPref("Show document outline by default", prefs_.showDocumentOutlineRmd())); |
<<<<<<<
if (BrowseCap.isWindowsDesktop())
{
chkCleanupAfterCheck_.getElement().getStyle().setMarginLeft(0,
Unit.PX);
}
=======
>>>>>>>
if (BrowseCap.isWindowsDesktop())
{
chkCleanupAfterCheck_.getElement().getStyle().setMarginLeft(0,
Unit.PX);
} |
<<<<<<<
=======
protected void focusInitialControl()
{
textbox_.setFocus(true);
textbox_.setSelectionRange(0, textbox_.getText().length());
}
@Override
>>>>>>>
protected void focusInitialControl()
{
textbox_.setFocus(true);
textbox_.setSelectionRange(0, textbox_.getText().length());
}
@Override |
<<<<<<<
openFile(event.getFile(),
event.getFileType(),
new CommandWithArg<EditingTarget>() {
@Override
public void execute(EditingTarget target)
{
FilePosition position = event.getPosition();
if (position != null)
{
target.jumpToPosition(position);
target.focus();
}
}
});
=======
final CommandWithArg<FileSystemItem> action = new CommandWithArg<FileSystemItem>()
{
@Override
public void execute(FileSystemItem file)
{
openFile(file, event.getFileType());
}
};
if (event.getFile().getLength() < 0)
{
// If the file has no size info, stat the file from the server. This
// is to prevent us from opening large files accidentally.
server_.stat(event.getFile().getPath(), new ServerRequestCallback<FileSystemItem>()
{
@Override
public void onResponseReceived(FileSystemItem response)
{
action.execute(response);
}
@Override
public void onError(ServerError error)
{
// Couldn't stat the file? Proceed anyway. If the file doesn't
// exist, we'll let the downstream code be the one to show the
// error.
action.execute(event.getFile());
}
});
}
else
{
action.execute(event.getFile());
}
>>>>>>>
final CommandWithArg<FileSystemItem> action = new CommandWithArg<FileSystemItem>()
{
@Override
public void execute(FileSystemItem file)
{
openFile(file,
event.getFileType(),
new CommandWithArg<EditingTarget>() {
@Override
public void execute(EditingTarget target)
{
FilePosition position = event.getPosition();
if (position != null)
{
target.jumpToPosition(position);
target.focus();
}
}
});
}
};
if (event.getFile().getLength() < 0)
{
// If the file has no size info, stat the file from the server. This
// is to prevent us from opening large files accidentally.
server_.stat(event.getFile().getPath(), new ServerRequestCallback<FileSystemItem>()
{
@Override
public void onResponseReceived(FileSystemItem response)
{
action.execute(response);
}
@Override
public void onError(ServerError error)
{
// Couldn't stat the file? Proceed anyway. If the file doesn't
// exist, we'll let the downstream code be the one to show the
// error.
action.execute(event.getFile());
}
});
}
else
{
action.execute(event.getFile());
} |
<<<<<<<
/**
* Whether to enable experimental visual markdown editing
*/
public PrefValue<Boolean> enableVisualMarkdownEditingMode()
{
return bool("enable_visual_markdown_editing_mode", false);
}
=======
/**
* List of aria-live announcements to disable.
*/
public PrefValue<JsArrayString> disabledAriaLiveAnnouncements()
{
return object("disabled_aria_live_announcements", JsArrayUtil.createStringArray());
}
>>>>>>>
/**
* Whether to enable experimental visual markdown editing
*/
public PrefValue<Boolean> enableVisualMarkdownEditingMode()
{
return bool("enable_visual_markdown_editing_mode", false);
}
/**
* List of aria-live announcements to disable.
*/
public PrefValue<JsArrayString> disabledAriaLiveAnnouncements()
{
return object("disabled_aria_live_announcements", JsArrayUtil.createStringArray());
}
<<<<<<<
if (source.hasKey("enable_visual_markdown_editing_mode"))
enableVisualMarkdownEditingMode().setValue(layer, source.getBool("enable_visual_markdown_editing_mode"));
=======
if (source.hasKey("disabled_aria_live_announcements"))
disabledAriaLiveAnnouncements().setValue(layer, source.getObject("disabled_aria_live_announcements"));
>>>>>>>
if (source.hasKey("enable_visual_markdown_editing_mode"))
enableVisualMarkdownEditingMode().setValue(layer, source.getBool("enable_visual_markdown_editing_mode"));
if (source.hasKey("disabled_aria_live_announcements"))
disabledAriaLiveAnnouncements().setValue(layer, source.getObject("disabled_aria_live_announcements")); |
<<<<<<<
=======
private String yankedText_ = null;
private final List<HandlerRegistration> editorEventListeners_;
>>>>>>>
private String yankedText_ = null;
private final List<HandlerRegistration> editorEventListeners_; |
<<<<<<<
@Override
public void renderRmd(String file, String encoding,
ServerRequestCallback<Boolean> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(file));
params.set(1, new JSONString(encoding));
sendRequest(RPC_SCOPE,
RENDER_RMD,
params,
requestCallback);
}
@Override
public void terminateRenderRmd(ServerRequestCallback<Void> requestCallback)
{
sendRequest(RPC_SCOPE,
TERMINATE_RENDER_RMD,
requestCallback);
}
=======
@Override
public void getShinyAppsAccountList(
ServerRequestCallback<JsArrayString> requestCallback)
{
sendRequest(RPC_SCOPE,
GET_SHINYAPPS_ACCOUNT_LIST,
requestCallback);
}
@Override
public void removeShinyAppsAccount(String accountName,
ServerRequestCallback<Void> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(accountName));
sendRequest(RPC_SCOPE,
REMOVE_SHINYAPPS_ACCOUNT,
params,
requestCallback);
}
@Override
public void connectShinyAppsAccount(String command,
ServerRequestCallback<Void> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(command));
sendRequest(RPC_SCOPE,
CONNECT_SHINYAPPS_ACCOUNT,
params,
requestCallback);
}
@Override
public void getShinyAppsAppList(
String accountName,
ServerRequestCallback<JsArray<ShinyAppsApplicationInfo>> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(accountName));
sendRequest(RPC_SCOPE,
GET_SHINYAPPS_APP_LIST,
params,
requestCallback);
}
@Override
public void getShinyAppsDeployments(
String dir,
ServerRequestCallback<JsArray<ShinyAppsDeploymentRecord>> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(dir));
sendRequest(RPC_SCOPE,
GET_SHINYAPPS_DEPLOYMENTS,
params,
requestCallback);
}
>>>>>>>
@Override
public void getShinyAppsAccountList(
ServerRequestCallback<JsArrayString> requestCallback)
{
sendRequest(RPC_SCOPE,
GET_SHINYAPPS_ACCOUNT_LIST,
requestCallback);
}
@Override
public void removeShinyAppsAccount(String accountName,
ServerRequestCallback<Void> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(accountName));
sendRequest(RPC_SCOPE,
REMOVE_SHINYAPPS_ACCOUNT,
params,
requestCallback);
}
@Override
public void connectShinyAppsAccount(String command,
ServerRequestCallback<Void> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(command));
sendRequest(RPC_SCOPE,
CONNECT_SHINYAPPS_ACCOUNT,
params,
requestCallback);
}
@Override
public void getShinyAppsAppList(
String accountName,
ServerRequestCallback<JsArray<ShinyAppsApplicationInfo>> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(accountName));
sendRequest(RPC_SCOPE,
GET_SHINYAPPS_APP_LIST,
params,
requestCallback);
}
@Override
public void getShinyAppsDeployments(
String dir,
ServerRequestCallback<JsArray<ShinyAppsDeploymentRecord>> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(dir));
sendRequest(RPC_SCOPE,
GET_SHINYAPPS_DEPLOYMENTS,
params,
requestCallback);
}
@Override
public void renderRmd(String file, String encoding,
ServerRequestCallback<Boolean> requestCallback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(file));
params.set(1, new JSONString(encoding));
sendRequest(RPC_SCOPE,
RENDER_RMD,
params,
requestCallback);
}
@Override
public void terminateRenderRmd(ServerRequestCallback<Void> requestCallback)
{
sendRequest(RPC_SCOPE,
TERMINATE_RENDER_RMD,
requestCallback);
}
<<<<<<<
private static final String RENDER_RMD = "render_rmd";
private static final String TERMINATE_RENDER_RMD = "terminate_render_rmd";
=======
private static final String GET_SHINYAPPS_ACCOUNT_LIST = "get_shinyapps_account_list";
private static final String REMOVE_SHINYAPPS_ACCOUNT = "remove_shinyapps_account";
private static final String CONNECT_SHINYAPPS_ACCOUNT = "connect_shinyapps_account";
private static final String GET_SHINYAPPS_APP_LIST = "get_shinyapps_app_list";
private static final String GET_SHINYAPPS_DEPLOYMENTS = "get_shinyapps_deployments";
>>>>>>>
private static final String GET_SHINYAPPS_ACCOUNT_LIST = "get_shinyapps_account_list";
private static final String REMOVE_SHINYAPPS_ACCOUNT = "remove_shinyapps_account";
private static final String CONNECT_SHINYAPPS_ACCOUNT = "connect_shinyapps_account";
private static final String GET_SHINYAPPS_APP_LIST = "get_shinyapps_app_list";
private static final String GET_SHINYAPPS_DEPLOYMENTS = "get_shinyapps_deployments";
private static final String RENDER_RMD = "render_rmd";
private static final String TERMINATE_RENDER_RMD = "terminate_render_rmd"; |
<<<<<<<
public abstract AppCommand viewShortcuts();
=======
// Viewer
public abstract AppCommand viewerPopout();
public abstract AppCommand viewerRefresh();
public abstract AppCommand viewerStop();
public abstract AppCommand viewerClear();
>>>>>>>
public abstract AppCommand viewShortcuts();
// Viewer
public abstract AppCommand viewerPopout();
public abstract AppCommand viewerRefresh();
public abstract AppCommand viewerStop();
public abstract AppCommand viewerClear(); |
<<<<<<<
void injectMembers(RSConnectPublishButton publishButton);
void injectMembers(RSConnectDeploy deploy);
=======
void injectMembers(SnippetHelper helper);
>>>>>>>
void injectMembers(SnippetHelper helper);
void injectMembers(RSConnectPublishButton publishButton);
void injectMembers(RSConnectDeploy deploy); |
<<<<<<<
@Override
public void pandocGetBibliography(String file, String csl, ServerRequestCallback<JavaScriptObject> callback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(file));
params.set(1, new JSONString(StringUtil.notNull(csl)));
sendRequest(RPC_SCOPE, PANDOC_GET_BIBLIOGRAPHY, params, callback);
}
=======
@Override
public void crossrefWorks(String query, ServerRequestCallback<JavaScriptObject> callback)
{
sendRequest(RPC_SCOPE, CROSSREF_WORKS, query, callback);
}
>>>>>>>
@Override
public void pandocGetBibliography(String file, String csl, ServerRequestCallback<JavaScriptObject> callback)
{
JSONArray params = new JSONArray();
params.set(0, new JSONString(file));
params.set(1, new JSONString(StringUtil.notNull(csl)));
sendRequest(RPC_SCOPE, PANDOC_GET_BIBLIOGRAPHY, params, callback);
}
@Override
public void crossrefWorks(String query, ServerRequestCallback<JavaScriptObject> callback)
{
sendRequest(RPC_SCOPE, CROSSREF_WORKS, query, callback);
}
<<<<<<<
private static final String PANDOC_GET_BIBLIOGRAPHY = "pandoc_get_bibliography";
=======
private static final String CROSSREF_WORKS = "crossref_works";
>>>>>>>
private static final String PANDOC_GET_BIBLIOGRAPHY = "pandoc_get_bibliography";
private static final String CROSSREF_WORKS = "crossref_works"; |
<<<<<<<
=======
import org.rstudio.core.client.ExternalJavaScriptLoader.Callback;
import org.rstudio.core.client.KeyboardTracker;
>>>>>>>
import org.rstudio.core.client.ExternalJavaScriptLoader.Callback;
import org.rstudio.core.client.KeyboardTracker;
<<<<<<<
widget_.addFoldChangeHandler(event -> AceEditor.this.fireEvent(new FoldChangeEvent()));
=======
widget_.addFoldChangeHandler(new FoldChangeEvent.Handler()
{
@Override
public void onFoldChange(FoldChangeEvent event)
{
AceEditor.this.fireEvent(new FoldChangeEvent());
}
});
events_.addHandler(EditEvent.TYPE, new EditEvent.Handler()
{
@Override
public void onEdit(EditEvent event)
{
if (event.isBeforeEdit())
{
activeEditEventType_ = event.getType();
}
else
{
Scheduler.get().scheduleDeferred(() ->
{
activeEditEventType_ = EditEvent.TYPE_NONE;
});
}
}
});
>>>>>>>
widget_.addFoldChangeHandler(event -> AceEditor.this.fireEvent(new FoldChangeEvent()));
events_.addHandler(EditEvent.TYPE, new EditEvent.Handler()
{
@Override
public void onEdit(EditEvent event)
{
if (event.isBeforeEdit())
{
activeEditEventType_ = event.getType();
}
else
{
Scheduler.get().scheduleDeferred(() ->
{
activeEditEventType_ = EditEvent.TYPE_NONE;
});
}
}
});
<<<<<<<
Scheduler.get().scheduleDeferred(() -> {
Range range = Range.fromPoints(start, getSelectionEnd());
indentPastedRange(range);
});
=======
Scheduler.get().scheduleDeferred(new ScheduledCommand()
{
@Override
public void execute()
{
Range range = Range.fromPoints(start, getSelectionEnd());
if (shouldIndentOnPaste())
indentPastedRange(range);
}
});
}
>>>>>>>
Scheduler.get().scheduleDeferred(() -> {
Range range = Range.fromPoints(start, getSelectionEnd());
if (shouldIndentOnPaste())
indentPastedRange(range);
}); |
<<<<<<<
final ServerRequestCallback<SessionInfo> callback = new ServerRequestCallback<SessionInfo>() {
=======
boolean showLongInitDialog = !ApplicationAction.isLauncherSession();
// attempt init
pClientInit_.get().execute(showLongInitDialog,
new ServerRequestCallback<SessionInfo>() {
>>>>>>>
boolean showLongInitDialog = !ApplicationAction.isLauncherSession();
final ServerRequestCallback<SessionInfo> callback = new ServerRequestCallback<SessionInfo>() { |
<<<<<<<
return widget_.getEditor().isRowFullyVisible(position.getRow());
}
public void beginCollabSession(String serverUrl)
{
=======
collab_.beginCollabSession(this, serverUrl);
}
@Override
public void endCollabSession()
{
collab_.endCollabSession(this);
>>>>>>>
return widget_.getEditor().isRowFullyVisible(position.getRow());
}
public void beginCollabSession(String serverUrl)
{
collab_.beginCollabSession(this, serverUrl);
}
public void endCollabSession()
{
collab_.endCollabSession(this);
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import com.google.gwt.core.client.JavaScriptObject;
=======
import com.google.gwt.user.client.Command;
>>>>>>>
import com.google.gwt.core.client.JavaScriptObject;
import com.google.gwt.user.client.Command;
<<<<<<<
public void convertToYAML(JavaScriptObject input,
final CommandWithArg<String> onFinished)
{
server_.convertToYAML(input, new ServerRequestCallback<RmdYamlResult>()
{
@Override
public void onResponseReceived(RmdYamlResult yamlResult)
{
onFinished.execute(yamlResult.getYaml());
}
@Override
public void onError(ServerError error)
{
onFinished.execute("");
}
});
}
=======
private void installRMarkdownPackage(String action,
final Command onInstalled)
{
globalDisplay_.showYesNoMessage(
MessageDialog.QUESTION,
"Install Required Package",
action + " requires the rmarkdown package. " +
"Do you want to install it now?",
new Operation() {
@Override
public void execute()
{
server_.installRMarkdown(
new SimpleRequestCallback<ConsoleProcess>() {
@Override
public void onResponseReceived(ConsoleProcess proc)
{
final ConsoleProgressDialog dialog =
new ConsoleProgressDialog(proc, server_);
dialog.showModal();
proc.addProcessExitHandler(
new ProcessExitEvent.Handler()
{
@Override
public void onProcessExit(ProcessExitEvent event)
{
ifRMarkdownInstalled(new Command() {
@Override
public void execute()
{
dialog.hide();
onInstalled.execute();
}
});
}
});
}
});
}
},
true);
}
private void ifRMarkdownInstalled(final Command onInstalled)
{
server_.getRMarkdownContext(new SimpleRequestCallback<RMarkdownContext>(){
@Override
public void onResponseReceived(RMarkdownContext context)
{
if (context.getRMarkdownInstalled())
onInstalled.execute();
}
});
}
>>>>>>>
public void convertToYAML(JavaScriptObject input,
final CommandWithArg<String> onFinished)
{
server_.convertToYAML(input, new ServerRequestCallback<RmdYamlResult>()
{
@Override
public void onResponseReceived(RmdYamlResult yamlResult)
{
onFinished.execute(yamlResult.getYaml());
}
@Override
public void onError(ServerError error)
{
onFinished.execute("");
}
});
}
private void installRMarkdownPackage(String action,
final Command onInstalled)
{
globalDisplay_.showYesNoMessage(
MessageDialog.QUESTION,
"Install Required Package",
action + " requires the rmarkdown package. " +
"Do you want to install it now?",
new Operation() {
@Override
public void execute()
{
server_.installRMarkdown(
new SimpleRequestCallback<ConsoleProcess>() {
@Override
public void onResponseReceived(ConsoleProcess proc)
{
final ConsoleProgressDialog dialog =
new ConsoleProgressDialog(proc, server_);
dialog.showModal();
proc.addProcessExitHandler(
new ProcessExitEvent.Handler()
{
@Override
public void onProcessExit(ProcessExitEvent event)
{
ifRMarkdownInstalled(new Command() {
@Override
public void execute()
{
dialog.hide();
onInstalled.execute();
}
});
}
});
}
});
}
},
true);
}
private void ifRMarkdownInstalled(final Command onInstalled)
{
server_.getRMarkdownContext(new SimpleRequestCallback<RMarkdownContext>(){
@Override
public void onResponseReceived(RMarkdownContext context)
{
if (context.getRMarkdownInstalled())
onInstalled.execute();
}
});
} |
<<<<<<<
Rectangle getPositionBounds(Position position);
Position toDocumentPosition(ScreenCoordinates coordinates);
=======
Position screenCoordinatesToDocumentPosition(int pageX, int pageY);
>>>>>>>
Rectangle getPositionBounds(Position position);
Position toDocumentPosition(ScreenCoordinates coordinates);
Position screenCoordinatesToDocumentPosition(int pageX, int pageY); |
<<<<<<<
public final native boolean getHaveAdvancedStepCommands() /*-{
return this.have_advanced_step_commands;
}-*/;
=======
public final native boolean getDisableCheckForUpdates() /*-{
return this.disable_check_for_updates;
}-*/;
public final native boolean getShowIdentity() /*-{
return this.show_identity;
}-*/;
>>>>>>>
public final native boolean getDisableCheckForUpdates() /*-{
return this.disable_check_for_updates;
}-*/;
public final native boolean getShowIdentity() /*-{
return this.show_identity;
}-*/;
public final native boolean getHaveAdvancedStepCommands() /*-{
return this.have_advanced_step_commands;
}-*/; |
<<<<<<<
{
filePatterns.push(pattern);
if (StringUtil.equals(pattern, "package") &&
!session_.getSessionInfo().getBuildToolsType().equals(
SessionInfo.BUILD_TOOLS_PACKAGE))
Debug.logToConsole("Request to search package source when not in a package project.");
}
=======
includeFilePatterns.push(pattern);
>>>>>>>
includeFilePatterns.push(pattern);
<<<<<<<
dialog.getDirectoryChooser().addValueChangeHandler(new ValueChangeHandler<String>() {
@Override
public void onValueChange(ValueChangeEvent<String> event)
{
fileServer_.isGitDirectory(dialog.getDirectory(),
new ServerRequestCallback<Boolean>() {
@Override
public void onResponseReceived(Boolean isGitDirectory)
{
if (isGitDirectory)
dialog.setGitStatus(true);
else
dialog.setGitStatus(false);
}
@Override
public void onError(ServerError error)
{
// assume true if we are not sure
// if the user enters invalid data it will be handled by the backend
dialog.setGitStatus(true);
Debug.logError(error);
}
});
fileServer_.isPackageDirectory(dialog.getDirectory(),
new ServerRequestCallback<Boolean>()
{
@Override
public void onResponseReceived(final Boolean isPackageDirectory)
{
dialog.setPackageStatus(isPackageDirectory);
}
@Override
public void onError(ServerError error)
{
// assume true if we are not sure
// if the user enters invalid data it will be handled by the backend
dialog.setPackageStatus(true);
Debug.logError(error);
}
});
}
});
=======
if (session_.getSessionInfo().isVcsAvailable(VCSConstants.GIT_ID))
{
dialog.getDirectoryChooser().addValueChangeHandler(new ValueChangeHandler<String>() {
@Override
public void onValueChange(ValueChangeEvent<String> event)
{
fileServer_.isGitDirectory(dialog.getDirectory(),
new ServerRequestCallback<Boolean>() {
@Override
public void onResponseReceived(Boolean isGitDirectory)
{
dialog.setGitStatus(isGitDirectory);
}
@Override
public void onError(ServerError error)
{
// assume true if we are not sure
// if the user enters invalid data it will be handled later
dialog.setGitStatus(true);
Debug.logError(error);
}
});
}
});
}
>>>>>>>
dialog.getDirectoryChooser().addValueChangeHandler(new ValueChangeHandler<String>() {
@Override
public void onValueChange(ValueChangeEvent<String> event)
{
if (session_.getSessionInfo().isVcsAvailable(VCSConstants.GIT_ID))
{
fileServer_.isGitDirectory(dialog.getDirectory(),
new ServerRequestCallback<Boolean>() {
@Override
public void onResponseReceived(Boolean isGitDirectory)
{
dialog.setGitStatus(isGitDirectory);
}
@Override
public void onError(ServerError error)
{
// assume true if we are not sure
// if the user enters invalid data it will be handled by the backend
dialog.setGitStatus(true);
Debug.logError(error);
}
});
}
fileServer_.isPackageDirectory(dialog.getDirectory(),
new ServerRequestCallback<Boolean>()
{
@Override
public void onResponseReceived(final Boolean isPackageDirectory)
{
dialog.setPackageStatus(isPackageDirectory);
}
@Override
public void onError(ServerError error)
{
// assume true if we are not sure
// if the user enters invalid data it will be handled by the backend
dialog.setPackageStatus(true);
Debug.logError(error);
}
});
}
}); |
<<<<<<<
void zoteroGetCollectionSpecs(ServerRequestCallback<JavaScriptObject> callback);
=======
void zoteroBetterBibtexExport(JsArrayString itemKeys,
String translatorId,
int libraryID,
ServerRequestCallback<JavaScriptObject> callback);
>>>>>>>
void zoteroGetCollectionSpecs(ServerRequestCallback<JavaScriptObject> callback);
void zoteroBetterBibtexExport(JsArrayString itemKeys,
String translatorId,
int libraryID,
ServerRequestCallback<JavaScriptObject> callback); |
<<<<<<<
=======
if (f.getType().isEnum()){
value = Enum.valueOf((Class) f.getType(), value.toString());
}
>>>>>>> |
<<<<<<<
String collectionName = q.getCollectionName();
morphium.getDriver().delete(getDbName(), collectionName, q.toQueryObject(), multiple, wc);
=======
for (int i = 0; i < morphium.getConfig().getRetriesOnNetworkError(); i++) {
try {
String collectionName = q.getCollectionName();
if (collectionName == null) morphium.getMapper().getCollectionName(q.getType());
if (wc == null) {
morphium.getDatabase().getCollection(collectionName).remove(q.toQueryObject());
} else {
morphium.getDatabase().getCollection(collectionName).remove(q.toQueryObject(), wc);
}
break;
} catch (Throwable t) {
morphium.handleNetworkError(i, t);
}
}
>>>>>>>
String collectionName = q.getCollectionName();
morphium.getDriver().delete(getDbName(), collectionName, q.toQueryObject(), multiple, wc);
for (int i = 0; i < morphium.getConfig().getRetriesOnNetworkError(); i++) {
try {
String collectionName = q.getCollectionName();
if (collectionName == null) morphium.getMapper().getCollectionName(q.getType());
if (wc == null) {
morphium.getDatabase().getCollection(collectionName).remove(q.toQueryObject());
} else {
morphium.getDatabase().getCollection(collectionName).remove(q.toQueryObject(), wc);
}
break;
} catch (Throwable t) {
morphium.handleNetworkError(i, t);
}
} |
<<<<<<<
=======
import static com.google.common.base.Charsets.UTF_8;
import java.util.Iterator;
>>>>>>>
import static com.google.common.base.Charsets.UTF_8; |
<<<<<<<
private Integer optime;
=======
>>>>>>>
<<<<<<<
public Integer getOptime() {
return optime;
}
public void setOptime(Integer optime) {
this.optime = optime;
}
=======
>>>>>>> |
<<<<<<<
*
* <p>If necessary, it can include Left and
=======
*
* <p/>If necessary, it can include Left and
>>>>>>>
*
* <p/>If necessary, it can include Left and
<<<<<<<
* string, e.g. {5} or {5-10}.</p>
*
*
=======
* string, e.g. {5} or {5-10}.
*
*
>>>>>>>
* string, e.g. {5} or {5-10}.
*
*
<<<<<<<
}
/**
* @param name Name of attribute to set
* @param value Value of attribute to set (may be ignored)
*/
=======
//this.minFragLength = theLength;
}
>>>>>>>
//this.minFragLength = theLength;
}
/**
* @param name Name of attribute to set
* @param value Value of attribute to set (may be ignored)
*/
<<<<<<<
/** Uses the Boyer-Moore-Horspool search algorithm to find a sequence within a window
* on a file.
*
* The search proceeds by trying to find an "anchor" sequence of bytes
* in the file, using the Boyer-Moore-Horspool algorithm, which permits it
* to skip over bytes if they can't possibly match the anchor sequence.
* It scans from the opposite end of the sequence to the search direction.
* This means it doesn't have to check every single byte in the search window.
* In general, the longer the anchor sequence, the more bytes we can skip.
* When it finds an anchor sequence, it checks any left or right
* fragments that may surround it, to verify the match.
*
* @param position The position to begin searching from.
* @param targetFile The file to search in.
* @param maxBytesToScan The maximum amount of bytes to read from
* the beginning or end of the file. If negative, scanning is unlimited.
* @param bofSubsequence Indicates when subsequence is anchored to BOF
* @param eofSubsequence Indicates when subsequence is anchored to EOF
* @return boolean True on success
*/
//CHECKSTYLE:OFF - far too complex method.
public final boolean findSequenceFromPosition(final long position,
final ByteReader targetFile, final long maxBytesToScan,
final boolean bofSubsequence, final boolean eofSubsequence) {
boolean entireSequenceFound = false;
try {
// Local variables to speed up commonly used arrays and decisions:
final boolean hasLeftFragments = !orderedLeftFragments.isEmpty();
final boolean hasRightFragments = !orderedRightFragments.isEmpty();
// Define the length of the file and the pattern, minus one to get an offset from a zero index position.
final long lastBytePositionInFile = targetFile.getNumBytes() - 1;
//final int lastBytePositionInAnchor = sequence.length -1;
final int matchLength = matcher.length();
final int lastBytePositionInAnchor = matchLength - 1;
=======
>>>>>>> |
<<<<<<<
import net.byteseek.parser.tree.ParseTreeType;
import net.byteseek.parser.tree.node.ByteNode;
import net.byteseek.parser.tree.node.ChildrenNode;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
=======
>>>>>>>
<<<<<<<
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
import static net.byteseek.parser.tree.ParseTreeType.BYTE;
import static net.byteseek.parser.tree.ParseTreeType.STRING;
=======
>>>>>>>
<<<<<<<
private void toPRONOMExpression(final ParseTree tree, final StringBuilder builder, SignatureType sigType, boolean spaceElements, final boolean inSet, final boolean inAlternatives) throws ParseException {
=======
//CHECKSTYLE:OFF - cyclomatic complexity too high.
private void toPRONOMExpression(final ParseTree tree, final StringBuilder builder, SignatureType sigType,
boolean spaceElements, final boolean inBrackets) throws ParseException {
>>>>>>>
//CHECKSTYLE:OFF - cyclomatic complexity too high.
private void toPRONOMExpression(final ParseTree tree, final StringBuilder builder, SignatureType sigType, boolean spaceElements, final boolean inSet, final boolean inAlternatives) throws ParseException { |
<<<<<<<
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.getConstructor;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.outputQualifiedTypename;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.printCollectedTypeArguments;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.printTypeArguments;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.typeNameOrList;
import static org.eclipse.ceylon.model.typechecker.model.ModelUtil.getContainingDeclaration;
import static org.eclipse.ceylon.model.typechecker.model.ModelUtil.isConstructor;
=======
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.outputQualifiedTypename;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.printTypeArguments;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.typeNameOrList;
>>>>>>>
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.getConstructor;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.outputQualifiedTypename;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.printCollectedTypeArguments;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.printTypeArguments;
import static org.eclipse.ceylon.compiler.js.util.TypeUtils.typeNameOrList;
import static org.eclipse.ceylon.model.typechecker.model.ModelUtil.getContainingDeclaration;
import static org.eclipse.ceylon.model.typechecker.model.ModelUtil.isConstructor;
<<<<<<<
import org.eclipse.ceylon.compiler.js.util.JsIdentifierNames;
=======
import org.eclipse.ceylon.compiler.js.util.TypeUtils;
>>>>>>>
import org.eclipse.ceylon.compiler.js.util.JsIdentifierNames;
import org.eclipse.ceylon.compiler.js.util.TypeUtils;
<<<<<<<
import org.eclipse.ceylon.model.typechecker.model.NothingType;
import org.eclipse.ceylon.model.typechecker.model.Package;
import org.eclipse.ceylon.model.typechecker.model.Reference;
=======
import org.eclipse.ceylon.model.typechecker.model.Reference;
>>>>>>>
import org.eclipse.ceylon.model.typechecker.model.NothingType;
import org.eclipse.ceylon.model.typechecker.model.Package;
import org.eclipse.ceylon.model.typechecker.model.Reference;
<<<<<<<
JsIdentifierNames names = gen.getNames();
if (d instanceof Interface) {
=======
if (d instanceof Interface) {
>>>>>>>
JsIdentifierNames names = gen.getNames();
if (d instanceof Interface) {
<<<<<<<
parents.add(0,pd);
pd = pd.isMember() ?
(Declaration)
pd.getContainer() :
null;
=======
parents.add(0, pd);
pd = pd.isMember() ? (Declaration)pd.getContainer() : null;
>>>>>>>
parents.add(0,pd);
pd = pd.isMember() ?
(Declaration)
pd.getContainer() :
null;
<<<<<<<
outputQualifiedTypename(null,
gen.isImported(gen.getCurrentPackage(), td),
ltype, gen, false);
=======
outputQualifiedTypename(null, gen.isImported(gen.getCurrentPackage(), td), ltype, gen, false);
>>>>>>>
outputQualifiedTypename(null,
gen.isImported(gen.getCurrentPackage(), td),
ltype, gen, false);
<<<<<<<
gen.out(gen.getClAlias(),
"typeLiteral$meta({Type$typeLiteral:");
typeNameOrList(that, ltype, gen, false);
=======
gen.out(gen.getClAlias(), "typeLiteral$meta({Type$typeLiteral:");
typeNameOrList(that, ltype, gen, false);
>>>>>>>
gen.out(gen.getClAlias(),
"typeLiteral$meta({Type$typeLiteral:");
typeNameOrList(that, ltype, gen, false);
<<<<<<<
Class cla = (Class) cd.getContainer();
gen.out(gen.getClAlias(),
cla.isClassOrInterfaceMember() ?
"$i$AppliedMemberClass" :
"$i$Applied",
cd.isValueConstructor() ?
"Value" :
"Callable",
"Constructor$jsint()(");
outputQualifiedTypename(null,
gen.isImported(gen.getCurrentPackage(), cla),
cla.getType(), gen, false);
JsIdentifierNames names = gen.getNames();
gen.out(names.constructorSeparator(cd),
cd.isValueConstructor() ?
names.name(meta.getDeclaration()) :
names.name(cd),
",");
=======
Class pc = (Class)cd.getContainer();
if (pc.isClassOrInterfaceMember()) {
gen.out(gen.getClAlias(), "$i$AppliedMemberClass",
cd.isValueConstructor() ? "Value" : "Callable",
"Constructor$jsint()(");
} else {
gen.out(gen.getClAlias(), "$i$Applied",
cd.isValueConstructor() ? "Value" : "Callable",
"Constructor$jsint()(");
}
outputQualifiedTypename(null, gen.isImported(gen.getCurrentPackage(), pc), pc.getType(), gen, false);
String constructorSeparator = gen.getNames().constructorSeparator(cd);
if (cd.isValueConstructor()) {
gen.out(constructorSeparator, gen.getNames().name(meta.getDeclaration()), ",");
} else {
gen.out(constructorSeparator, gen.getNames().name(cd), ",");
}
>>>>>>>
Class cla = (Class) cd.getContainer();
gen.out(gen.getClAlias(),
cla.isClassOrInterfaceMember() ?
"$i$AppliedMemberClass" :
"$i$Applied",
cd.isValueConstructor() ?
"Value" :
"Callable",
"Constructor$jsint()(");
outputQualifiedTypename(null,
gen.isImported(gen.getCurrentPackage(), cla),
cla.getType(), gen, false);
JsIdentifierNames names = gen.getNames();
gen.out(names.constructorSeparator(cd),
cd.isValueConstructor() ?
names.name(meta.getDeclaration()) :
names.name(cd),
",");
<<<<<<<
printTypeArguments(meta, mtype, gen, false);
if (ltype != null
&& !ltype.collectTypeArguments().isEmpty()) {
gen.out(",undefined,");
printCollectedTypeArguments(meta, ltype, gen, false);
=======
printTypeArguments(meta, mtype, gen, false);
if (ltype != null) {
Type qtype = ltype.getQualifyingType();
Map<TypeParameter, Type> typeArguments = qtype.getTypeArguments();
if (typeArguments != null && !typeArguments.isEmpty()) {
gen.out(",undefined,");
Map<TypeParameter, SiteVariance> varianceOverrides =
qtype.getVarianceOverrides();
printTypeArguments(meta, gen, false, typeArguments, varianceOverrides);
}
>>>>>>>
printTypeArguments(meta, mtype, gen, false);
if (ltype != null
&& !ltype.collectTypeArguments().isEmpty()) {
gen.out(",undefined,");
printCollectedTypeArguments(meta, ltype, gen, false);
<<<<<<<
static void generateMemberLiteral(final Tree.MemberLiteral that,
final GenerateJsVisitor gen) {
final Reference ref = that.getTarget();
final Type type = that.getTypeModel();
Tree.StaticType st = that.getType();
Type ltype = st == null ? null :
st.getTypeModel().resolveAliases();
=======
static void generateMemberLiteral(final Tree.MemberLiteral that, final GenerateJsVisitor gen) {
final Reference ref = that.getTarget();
Tree.StaticType type = that.getType();
Type ltype = type == null ? null : type.getTypeModel().resolveAliases();
>>>>>>>
static void generateMemberLiteral(final Tree.MemberLiteral that,
final GenerateJsVisitor gen) {
final Reference ref = that.getTarget();
final Type type = that.getTypeModel();
Tree.StaticType st = that.getType();
Type ltype = st == null ? null :
st.getTypeModel().resolveAliases();
<<<<<<<
final Scope container = d.getContainer();
final Class anonClass = d.isMember()
&& container instanceof Class
&& ((Class) container).isAnonymous() ?
(Class) container : null;
=======
final Scope container = d.getContainer();
final Class anonClass = d.isMember()
&& container instanceof Class
&& ((Class)container).isAnonymous() ?
(Class)container : null;
>>>>>>>
final Scope container = d.getContainer();
final Class anonClass = d.isMember()
&& container instanceof Class
&& ((Class) container).isAnonymous() ?
(Class) container : null;
<<<<<<<
if (container instanceof TypeDeclaration) {
ltype = ((TypeDeclaration) container).getType();
} else if (container instanceof TypedDeclaration) {
ltype = ((TypedDeclaration) container).getType();
=======
if (container instanceof TypeDeclaration) {
ltype = ((TypeDeclaration)container).getType();
} else if (container instanceof TypedDeclaration) {
ltype = ((TypedDeclaration)container).getType();
>>>>>>>
if (container instanceof TypeDeclaration) {
ltype = ((TypeDeclaration) container).getType();
} else if (container instanceof TypedDeclaration) {
ltype = ((TypedDeclaration) container).getType();
<<<<<<<
Tree.TypeArgumentList tal =
that.getTypeArgumentList();
if (tal!=null) {
List<Type> typeModels = tal.getTypeModels();
=======
Tree.TypeArgumentList typeArgList = that.getTypeArgumentList();
if (typeArgList!=null) {
List<Type> typeModels = typeArgList.getTypeModels();
>>>>>>>
Tree.TypeArgumentList tal =
that.getTypeArgumentList();
if (tal!=null) {
List<Type> typeModels = tal.getTypeModels();
<<<<<<<
if (first) {
first=false;
}
else {
gen.out(",");
}
gen.out(gen.getClAlias(),
"typeLiteral$meta({Type$typeLiteral:");
typeNameOrList(that, targ, gen, false);
=======
if (first)first=false;else gen.out(",");
gen.out(gen.getClAlias(),"typeLiteral$meta({Type$typeLiteral:");
typeNameOrList(that, targ, gen, false);
>>>>>>>
if (first) {
first=false;
}
else {
gen.out(",");
}
gen.out(gen.getClAlias(),
"typeLiteral$meta({Type$typeLiteral:");
typeNameOrList(that, targ, gen, false);
<<<<<<<
printTypeArguments(that, gen, false,
ref.getTypeArguments(),
ref.getVarianceOverrides());
=======
Map<TypeParameter, SiteVariance> varianceOverrides =
ref.getType().getVarianceOverrides();
printTypeArguments(that, gen, false,
typeArguments,
varianceOverrides);
>>>>>>>
printTypeArguments(that, gen, false,
ref.getTypeArguments(),
ref.getVarianceOverrides());
<<<<<<<
gen.out(names.getter(vd, true),",");
printTypeArguments(that, type, gen, false);
=======
gen.out(gen.getNames().getter(vd, true),",");
printTypeArguments(that, that.getTypeModel(), gen, false);
>>>>>>>
gen.out(names.getter(vd, true),",");
printTypeArguments(that, type, gen, false);
<<<<<<<
gen.out(names.name(d));
if (ltype != null
&& !ltype.getTypeArguments().isEmpty()) {
gen.out(",a:");
printTypeArguments(that, ltype, gen, false);
=======
gen.out(gen.getNames().name(d));
if (ltype != null) {
Map<TypeParameter, Type> typeArguments = ltype.getTypeArguments();
if (typeArguments != null && !typeArguments.isEmpty()) {
gen.out(",a:");
printTypeArguments(that, ltype, gen, false);
}
>>>>>>>
gen.out(names.name(d));
if (ltype != null
&& !ltype.getTypeArguments().isEmpty()) {
gen.out(",a:");
printTypeArguments(that, ltype, gen, false);
<<<<<<<
static void outputPathToDeclaration(final Node that, final Declaration d,
final GenerateJsVisitor gen) {
final Declaration parent = getContainingDeclaration(d);
JsIdentifierNames names = gen.getNames();
if (!gen.opts.isOptimize()
&& parent instanceof TypeDeclaration
&& ModelUtil.contains((Scope) parent,
that.getScope())) {
gen.out(names.self((TypeDeclaration) parent),
".");
=======
static void outputPathToDeclaration(final Node that, final Declaration d, final GenerateJsVisitor gen) {
final Declaration parent = ModelUtil.getContainingDeclaration(d);
if (!gen.opts.isOptimize()
&& parent instanceof TypeDeclaration
&& ModelUtil.contains((Scope)parent, that.getScope())) {
gen.out(gen.getNames().self((TypeDeclaration)parent), ".");
>>>>>>>
static void outputPathToDeclaration(final Node that, final Declaration d,
final GenerateJsVisitor gen) {
final Declaration parent = getContainingDeclaration(d);
JsIdentifierNames names = gen.getNames();
if (!gen.opts.isOptimize()
&& parent instanceof TypeDeclaration
&& ModelUtil.contains((Scope) parent,
that.getScope())) {
gen.out(names.self((TypeDeclaration) parent),
"."); |
<<<<<<<
Put.class, //
Delete.class, //
Accept.class,
FromHtml.class})
=======
Put.class,
FromHtml.class, //
OptionsMenu.class, //
OptionsItem.class, //
HtmlRes.class, //
NoTitle.class, //
Fullscreen.class //
})
>>>>>>>
Put.class, //
Delete.class, //
Accept.class, //
FromHtml.class, //
OptionsMenu.class, //
OptionsItem.class, //
HtmlRes.class, //
NoTitle.class, //
Fullscreen.class //
}) |
<<<<<<<
import static org.apache.accumulo.tserver.compaction.DefaultCompactionStrategyTest.getServerContext;
=======
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
>>>>>>>
import static org.apache.accumulo.tserver.compaction.DefaultCompactionStrategyTest.getServerContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; |
<<<<<<<
import static com.sun.codemodel.JExpr.FALSE;
import static com.sun.codemodel.JExpr.TRUE;
import static com.sun.codemodel.JExpr._new;
import static com.sun.codemodel.JExpr._null;
import static com.sun.codemodel.JExpr._super;
import static com.sun.codemodel.JExpr._this;
import static com.sun.codemodel.JExpr.cast;
import static com.sun.codemodel.JExpr.invoke;
import static com.sun.codemodel.JMod.PRIVATE;
import static com.sun.codemodel.JMod.PUBLIC;
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
import java.util.ArrayList;
import java.util.List;
=======
import com.sun.codemodel.*;
import org.androidannotations.api.SdkVersionHelper;
import org.androidannotations.helper.*;
import org.androidannotations.process.ProcessHolder;
>>>>>>>
import com.sun.codemodel.*;
import org.androidannotations.api.SdkVersionHelper;
import org.androidannotations.helper.*;
import org.androidannotations.process.ProcessHolder;
import static org.androidannotations.helper.ModelConstants.GENERATION_SUFFIX;
<<<<<<<
import org.androidannotations.api.SdkVersionHelper;
import org.androidannotations.helper.ActionBarSherlockHelper;
import org.androidannotations.helper.ActivityIntentBuilder;
import org.androidannotations.helper.AndroidManifest;
import org.androidannotations.helper.AnnotationHelper;
import org.androidannotations.helper.CanonicalNameConstants;
import org.androidannotations.helper.GreenDroidHelper;
import org.androidannotations.helper.IntentBuilder;
import org.androidannotations.process.ProcessHolder;
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JClassAlreadyExistsException;
import com.sun.codemodel.JDefinedClass;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JInvocation;
import com.sun.codemodel.JMethod;
import com.sun.codemodel.JMod;
import com.sun.codemodel.JType;
import com.sun.codemodel.JVar;
=======
import static com.sun.codemodel.JExpr.*;
import static com.sun.codemodel.JMod.PRIVATE;
import static com.sun.codemodel.JMod.PUBLIC;
>>>>>>>
import static com.sun.codemodel.JExpr.*;
import static com.sun.codemodel.JMod.PRIVATE;
import static com.sun.codemodel.JMod.PUBLIC; |
<<<<<<<
public static String lowerCaseFirst(String string) {
if (string.length() < 2)
return string.toLowerCase();
String first = string.substring(0, 1).toLowerCase();
String end = string.substring(1, string.length());
return first + end;
}
=======
public static String camelCaseToUpperSnakeCase(String prefix, String camelCase, String suffix) {
if (prefix != null && !camelCase.startsWith(prefix)) {
camelCase = prefix + "_" + camelCase;
}
if (suffix != null && !camelCase.toLowerCase().endsWith(suffix.toLowerCase())) {
camelCase = camelCase + "_" + suffix;
}
return camelCaseToUpperSnakeCase(camelCase);
}
>>>>>>>
public static String lowerCaseFirst(String string) {
if (string.length() < 2)
return string.toLowerCase();
String first = string.substring(0, 1).toLowerCase();
String end = string.substring(1, string.length());
return first + end;
}
public static String camelCaseToUpperSnakeCase(String prefix, String camelCase, String suffix) {
if (prefix != null && !camelCase.startsWith(prefix)) {
camelCase = prefix + "_" + camelCase;
}
if (suffix != null && !camelCase.toLowerCase().endsWith(suffix.toLowerCase())) {
camelCase = camelCase + "_" + suffix;
}
return camelCaseToUpperSnakeCase(camelCase);
} |
<<<<<<<
=======
import static com.sun.codemodel.JExpr.lit;
import static com.sun.codemodel.JMod.FINAL;
import static com.sun.codemodel.JMod.PUBLIC;
>>>>>>>
import static com.sun.codemodel.JExpr.lit;
<<<<<<<
=======
import com.sun.codemodel.ClassType;
import com.sun.codemodel.JBlock;
>>>>>>>
import com.sun.codemodel.JBlock; |
<<<<<<<
import org.androidannotations.rclass.IRClass.Res;
=======
>>>>>>>
<<<<<<<
public class LongClickProcessor implements DecoratingElementProcessor {
private IdAnnotationHelper helper;
=======
/**
*
* @author Rostislav Chekan
*
*/
public class LongClickProcessor extends AbstractListenerProcessor {
>>>>>>>
public class LongClickProcessor extends AbstractListenerProcessor { |
<<<<<<<
modelValidator.register(new BeforeTextChangeValidator(processingEnv, rClass));
modelValidator.register(new TextChangeValidator(processingEnv, rClass));
modelValidator.register(new ProgressChangeValidator(processingEnv, rClass));
modelValidator.register(new TrackingTouchStartValidator(processingEnv, rClass));
modelValidator.register(new TrackingTouchStopValidator(processingEnv, rClass));
modelValidator.register(new AfterTextChangeValidator(processingEnv, rClass));
=======
>>>>>>>
modelValidator.register(new ProgressChangeValidator(processingEnv, rClass));
modelValidator.register(new TrackingTouchStartValidator(processingEnv, rClass));
modelValidator.register(new TrackingTouchStopValidator(processingEnv, rClass));
<<<<<<<
modelProcessor.register(new TextChangeProcessor(processingEnv, rClass));
modelProcessor.register(new ProgressChangeProcessor(processingEnv, rClass));
modelProcessor.register(new TrackingTouchStartProcessor(processingEnv, rClass));
modelProcessor.register(new TrackingTouchStopProcessor(processingEnv, rClass));
modelProcessor.register(new BeforeTextChangeProcessor(processingEnv, rClass));
modelProcessor.register(new AfterTextChangeProcessor(processingEnv, rClass));
=======
>>>>>>>
modelProcessor.register(new ProgressChangeProcessor(processingEnv, rClass));
modelProcessor.register(new TrackingTouchStartProcessor(processingEnv, rClass));
modelProcessor.register(new TrackingTouchStopProcessor(processingEnv, rClass)); |
<<<<<<<
import org.androidannotations.helper.TimeStats;
import org.androidannotations.logger.Level;
import org.androidannotations.logger.Logger;
import org.androidannotations.logger.LoggerContext;
import org.androidannotations.logger.LoggerFactory;
import org.androidannotations.model.AndroidRes;
import org.androidannotations.model.AndroidSystemServices;
import org.androidannotations.model.AnnotationElements;
import org.androidannotations.model.AnnotationElementsHolder;
import org.androidannotations.model.ModelExtractor;
import org.androidannotations.processing.AfterInjectProcessor;
import org.androidannotations.processing.AfterTextChangeProcessor;
import org.androidannotations.processing.AfterViewsProcessor;
import org.androidannotations.processing.AppProcessor;
import org.androidannotations.processing.BackgroundProcessor;
import org.androidannotations.processing.BeanProcessor;
import org.androidannotations.processing.BeforeTextChangeProcessor;
import org.androidannotations.processing.CheckedChangeProcessor;
import org.androidannotations.processing.ClickProcessor;
import org.androidannotations.processing.CustomTitleProcessor;
import org.androidannotations.processing.EActivityProcessor;
import org.androidannotations.processing.EApplicationProcessor;
import org.androidannotations.processing.EBeanProcessor;
import org.androidannotations.processing.EFragmentProcessor;
import org.androidannotations.processing.EIntentServiceProcessor;
import org.androidannotations.processing.EProviderProcessor;
import org.androidannotations.processing.EReceiverProcessor;
import org.androidannotations.processing.EServiceProcessor;
import org.androidannotations.processing.EViewGroupProcessor;
import org.androidannotations.processing.EViewProcessor;
import org.androidannotations.processing.ExtraProcessor;
import org.androidannotations.processing.FocusChangeProcessor;
import org.androidannotations.processing.FragmentArgProcessor;
import org.androidannotations.processing.FragmentByIdProcessor;
import org.androidannotations.processing.FragmentByTagProcessor;
import org.androidannotations.processing.FromHtmlProcessor;
import org.androidannotations.processing.FullscreenProcessor;
import org.androidannotations.processing.HierarchyViewerSupportProcessor;
import org.androidannotations.processing.HttpsClientProcessor;
import org.androidannotations.processing.InstanceStateProcessor;
import org.androidannotations.processing.ItemClickProcessor;
import org.androidannotations.processing.ItemLongClickProcessor;
import org.androidannotations.processing.ItemSelectedProcessor;
import org.androidannotations.processing.LongClickProcessor;
import org.androidannotations.processing.ModelProcessor;
import org.androidannotations.processing.ModelProcessor.ProcessResult;
import org.androidannotations.processing.NoTitleProcessor;
import org.androidannotations.processing.NonConfigurationInstanceProcessor;
import org.androidannotations.processing.OnActivityResultProcessor;
import org.androidannotations.processing.OptionsItemProcessor;
import org.androidannotations.processing.OptionsMenuItemProcessor;
import org.androidannotations.processing.OptionsMenuProcessor;
import org.androidannotations.processing.OrmLiteDaoProcessor;
import org.androidannotations.processing.PrefProcessor;
import org.androidannotations.processing.ProduceProcessor;
import org.androidannotations.processing.ResProcessor;
import org.androidannotations.processing.RestServiceProcessor;
import org.androidannotations.processing.RoboGuiceProcessor;
import org.androidannotations.processing.RootContextProcessor;
import org.androidannotations.processing.SeekBarProgressChangeProcessor;
import org.androidannotations.processing.SeekBarTouchStartProcessor;
import org.androidannotations.processing.SeekBarTouchStopProcessor;
import org.androidannotations.processing.ServiceActionProcessor;
import org.androidannotations.processing.SharedPrefProcessor;
import org.androidannotations.processing.SubscribeProcessor;
import org.androidannotations.processing.SystemServiceProcessor;
import org.androidannotations.processing.TextChangeProcessor;
import org.androidannotations.processing.TouchProcessor;
import org.androidannotations.processing.TraceProcessor;
import org.androidannotations.processing.TransactionalProcessor;
import org.androidannotations.processing.UiThreadProcessor;
import org.androidannotations.processing.ViewByIdProcessor;
import org.androidannotations.processing.WindowFeatureProcessor;
import org.androidannotations.processing.rest.DeleteProcessor;
import org.androidannotations.processing.rest.GetProcessor;
import org.androidannotations.processing.rest.HeadProcessor;
import org.androidannotations.processing.rest.OptionsProcessor;
import org.androidannotations.processing.rest.PostProcessor;
import org.androidannotations.processing.rest.PutProcessor;
import org.androidannotations.processing.rest.RestImplementationsHolder;
import org.androidannotations.processing.rest.RestProcessor;
=======
import org.androidannotations.model.*;
import org.androidannotations.process.ModelProcessor;
import org.androidannotations.process.ModelValidator;
import org.androidannotations.process.TimeStats;
>>>>>>>
import org.androidannotations.logger.Level;
import org.androidannotations.logger.Logger;
import org.androidannotations.logger.LoggerContext;
import org.androidannotations.logger.LoggerFactory;
import org.androidannotations.model.AndroidSystemServices;
import org.androidannotations.model.AnnotationElements;
import org.androidannotations.model.AnnotationElementsHolder;
import org.androidannotations.model.ModelExtractor;
import org.androidannotations.process.ModelProcessor;
import org.androidannotations.process.ModelValidator;
import org.androidannotations.process.TimeStats;
<<<<<<<
private Set<String> supportedAnnotationNames;
=======
>>>>>>>
<<<<<<<
=======
timeStats.setMessager(messager);
messager.printMessage(Diagnostic.Kind.NOTE, "Starting AndroidAnnotations annotation processing");
annotationHandlers = new AnnotationHandlers(processingEnv);
>>>>>>>
annotationHandlers = new AnnotationHandlers(processingEnv);
<<<<<<<
AnnotationElements validatedModel = validateAnnotations(extractedModel, rClass, androidSystemServices, androidManifest);
ProcessResult processResult = processAnnotations(validatedModel, rClass, androidSystemServices, androidManifest);
=======
annotationHandlers.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
AnnotationElements validatedModel = validateAnnotations(extractedModel);
ModelProcessor.ProcessResult processResult = processAnnotations(validatedModel);
>>>>>>>
annotationHandlers.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
AnnotationElements validatedModel = validateAnnotations(extractedModel);
ModelProcessor.ProcessResult processResult = processAnnotations(validatedModel); |
<<<<<<<
import java.io.PrintWriter;
import java.io.StringWriter;
=======
import java.net.URL;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
>>>>>>>
import java.net.URL;
import java.util.Properties;
<<<<<<<
=======
import org.androidannotations.annotations.AfterInject;
import org.androidannotations.annotations.AfterTextChange;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.App;
import org.androidannotations.annotations.Background;
import org.androidannotations.annotations.Bean;
import org.androidannotations.annotations.BeforeTextChange;
import org.androidannotations.annotations.CheckedChange;
import org.androidannotations.annotations.Click;
import org.androidannotations.annotations.CustomTitle;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.EApplication;
import org.androidannotations.annotations.EBean;
import org.androidannotations.annotations.EFragment;
import org.androidannotations.annotations.EProvider;
import org.androidannotations.annotations.EReceiver;
import org.androidannotations.annotations.EService;
import org.androidannotations.annotations.EView;
import org.androidannotations.annotations.EViewGroup;
import org.androidannotations.annotations.Extra;
import org.androidannotations.annotations.FocusChange;
import org.androidannotations.annotations.FragmentArg;
import org.androidannotations.annotations.FragmentById;
import org.androidannotations.annotations.FragmentByTag;
import org.androidannotations.annotations.FromHtml;
import org.androidannotations.annotations.Fullscreen;
import org.androidannotations.annotations.HierarchyViewerSupport;
import org.androidannotations.annotations.HttpsClient;
import org.androidannotations.annotations.InstanceState;
import org.androidannotations.annotations.ItemClick;
import org.androidannotations.annotations.ItemLongClick;
import org.androidannotations.annotations.ItemSelect;
import org.androidannotations.annotations.LongClick;
import org.androidannotations.annotations.NoTitle;
import org.androidannotations.annotations.NonConfigurationInstance;
import org.androidannotations.annotations.OnActivityResult;
import org.androidannotations.annotations.OptionsItem;
import org.androidannotations.annotations.OptionsMenu;
import org.androidannotations.annotations.OptionsMenuItem;
import org.androidannotations.annotations.OrmLiteDao;
import org.androidannotations.annotations.RoboGuice;
import org.androidannotations.annotations.RootContext;
import org.androidannotations.annotations.SeekBarProgressChange;
import org.androidannotations.annotations.SeekBarTouchStart;
import org.androidannotations.annotations.SeekBarTouchStop;
import org.androidannotations.annotations.SystemService;
import org.androidannotations.annotations.TextChange;
import org.androidannotations.annotations.Touch;
import org.androidannotations.annotations.Trace;
import org.androidannotations.annotations.Transactional;
import org.androidannotations.annotations.UiThread;
import org.androidannotations.annotations.ViewById;
import org.androidannotations.annotations.WindowFeature;
import org.androidannotations.annotations.res.AnimationRes;
import org.androidannotations.annotations.res.BooleanRes;
import org.androidannotations.annotations.res.ColorRes;
import org.androidannotations.annotations.res.ColorStateListRes;
import org.androidannotations.annotations.res.DimensionPixelOffsetRes;
import org.androidannotations.annotations.res.DimensionPixelSizeRes;
import org.androidannotations.annotations.res.DimensionRes;
import org.androidannotations.annotations.res.DrawableRes;
import org.androidannotations.annotations.res.HtmlRes;
import org.androidannotations.annotations.res.IntArrayRes;
import org.androidannotations.annotations.res.IntegerRes;
import org.androidannotations.annotations.res.LayoutRes;
import org.androidannotations.annotations.res.MovieRes;
import org.androidannotations.annotations.res.StringArrayRes;
import org.androidannotations.annotations.res.StringRes;
import org.androidannotations.annotations.res.TextArrayRes;
import org.androidannotations.annotations.res.TextRes;
import org.androidannotations.annotations.rest.Accept;
import org.androidannotations.annotations.rest.Delete;
import org.androidannotations.annotations.rest.Get;
import org.androidannotations.annotations.rest.Head;
import org.androidannotations.annotations.rest.Options;
import org.androidannotations.annotations.rest.Post;
import org.androidannotations.annotations.rest.Put;
import org.androidannotations.annotations.rest.Rest;
import org.androidannotations.annotations.rest.RestService;
import org.androidannotations.annotations.sharedpreferences.Pref;
import org.androidannotations.annotations.sharedpreferences.SharedPref;
import org.androidannotations.exception.ProcessingException;
>>>>>>>
import org.androidannotations.exception.ProcessingException;
<<<<<<<
private AnnotationHandlers annotationHandlers;
=======
private final ErrorHelper errorHelper = new ErrorHelper();
private Set<String> supportedAnnotationNames;
>>>>>>>
private AnnotationHandlers annotationHandlers;
private final ErrorHelper errorHelper = new ErrorHelper();
private Set<String> supportedAnnotationNames;
<<<<<<<
=======
loadPropertyFile();
>>>>>>>
loadPropertyFile();
<<<<<<<
private AnnotationElements validateAnnotations(AnnotationElementsHolder extractedModel) {
=======
private AnnotationElements validateAnnotations(AnnotationElementsHolder extractedModel, IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) throws ProcessingException, Exception {
>>>>>>>
private AnnotationElements validateAnnotations(AnnotationElementsHolder extractedModel) throws ProcessingException, Exception {
<<<<<<<
private ModelProcessor.ProcessResult processAnnotations(AnnotationElements validatedModel) throws Exception {
=======
private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
ModelValidator modelValidator = new ModelValidator();
modelValidator.register(new EApplicationValidator(processingEnv, androidManifest));
modelValidator.register(new EActivityValidator(processingEnv, rClass, androidManifest));
modelValidator.register(new EServiceValidator(processingEnv, androidManifest));
modelValidator.register(new EReceiverValidator(processingEnv, androidManifest));
modelValidator.register(new EProviderValidator(processingEnv, androidManifest));
modelValidator.register(new EFragmentValidator(processingEnv, rClass));
modelValidator.register(new EViewGroupValidator(processingEnv, rClass));
modelValidator.register(new EViewValidator(processingEnv));
modelValidator.register(new EBeanValidator(processingEnv));
modelValidator.register(new RoboGuiceValidator(processingEnv));
modelValidator.register(new ViewByIdValidator(processingEnv, rClass));
modelValidator.register(new FragmentByIdValidator(processingEnv, rClass));
modelValidator.register(new FragmentByTagValidator(processingEnv));
modelValidator.register(new FromHtmlValidator(processingEnv, rClass));
modelValidator.register(new ClickValidator(processingEnv, rClass));
modelValidator.register(new LongClickValidator(processingEnv, rClass));
modelValidator.register(new TouchValidator(processingEnv, rClass));
modelValidator.register(new FocusChangeValidator(processingEnv, rClass));
modelValidator.register(new CheckedChangeValidator(processingEnv, rClass));
modelValidator.register(new ItemClickValidator(processingEnv, rClass));
modelValidator.register(new ItemSelectedValidator(processingEnv, rClass));
modelValidator.register(new ItemLongClickValidator(processingEnv, rClass));
for (AndroidRes androidRes : AndroidRes.values()) {
modelValidator.register(new ResValidator(androidRes, processingEnv, rClass));
}
modelValidator.register(new TransactionalValidator(processingEnv));
modelValidator.register(new ExtraValidator(processingEnv));
modelValidator.register(new FragmentArgValidator(processingEnv));
modelValidator.register(new SystemServiceValidator(processingEnv, androidSystemServices));
modelValidator.register(new SharedPrefValidator(processingEnv));
modelValidator.register(new PrefValidator(processingEnv));
modelValidator.register(new RestValidator(processingEnv, androidManifest));
modelValidator.register(new DeleteValidator(processingEnv));
modelValidator.register(new GetValidator(processingEnv));
modelValidator.register(new HeadValidator(processingEnv));
modelValidator.register(new OptionsValidator(processingEnv));
modelValidator.register(new PostValidator(processingEnv));
modelValidator.register(new PutValidator(processingEnv));
modelValidator.register(new AcceptValidator(processingEnv));
modelValidator.register(new AppValidator(processingEnv));
modelValidator.register(new OptionsMenuValidator(processingEnv, rClass));
modelValidator.register(new OptionsMenuItemValidator(processingEnv, rClass));
modelValidator.register(new OptionsItemValidator(processingEnv, rClass));
modelValidator.register(new NoTitleValidator(processingEnv));
modelValidator.register(new WindowFeatureValidator(processingEnv));
modelValidator.register(new CustomTitleValidator(processingEnv, rClass));
modelValidator.register(new FullscreenValidator(processingEnv));
modelValidator.register(new RestServiceValidator(processingEnv));
modelValidator.register(new RootContextValidator(processingEnv));
modelValidator.register(new NonConfigurationInstanceValidator(processingEnv));
modelValidator.register(new BeanValidator(processingEnv));
modelValidator.register(new AfterInjectValidator(processingEnv));
modelValidator.register(new BeforeTextChangeValidator(processingEnv, rClass));
modelValidator.register(new TextChangeValidator(processingEnv, rClass));
modelValidator.register(new AfterTextChangeValidator(processingEnv, rClass));
modelValidator.register(new SeekBarProgressChangeValidator(processingEnv, rClass));
modelValidator.register(new SeekBarTouchStartValidator(processingEnv, rClass));
modelValidator.register(new SeekBarTouchStopValidator(processingEnv, rClass));
/*
* Any view injection or listener binding should occur before
* AfterViewsValidator
*/
modelValidator.register(new AfterViewsValidator(processingEnv));
modelValidator.register(new TraceValidator(processingEnv));
modelValidator.register(new SubscribeValidator(processingEnv));
modelValidator.register(new ProduceValidator(processingEnv));
modelValidator.register(new RunnableValidator(UiThread.class.getName(), processingEnv));
modelValidator.register(new RunnableValidator(Background.class.getName(), processingEnv));
modelValidator.register(new InstanceStateValidator(processingEnv));
modelValidator.register(new OrmLiteDaoValidator(processingEnv, rClass));
modelValidator.register(new HttpsClientValidator(processingEnv, rClass));
modelValidator.register(new OnActivityResultValidator(processingEnv, rClass));
modelValidator.register(new HierarchyViewerSupportValidator(processingEnv, androidManifest));
return modelValidator;
}
private boolean traceActivated() {
Map<String, String> options = processingEnv.getOptions();
if (options.containsKey(TRACE_OPTION)) {
String trace = options.get(TRACE_OPTION);
return !"false".equals(trace);
} else {
return true;
}
}
private ProcessResult processAnnotations(AnnotationElements validatedModel, IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) throws ProcessingException, Exception {
>>>>>>>
private ModelProcessor.ProcessResult processAnnotations(AnnotationElements validatedModel) throws Exception {
<<<<<<<
private String stackTraceToString(Throwable e) {
StringWriter writer = new StringWriter();
PrintWriter pw = new PrintWriter(writer);
e.printStackTrace(pw);
return writer.toString().replace("\n", "");
}
=======
>>>>>>> |
<<<<<<<
private static final int FIRST_REQUEST = 11;
private static final int SECOND_REQUEST = 22;
private static final int THIRD_REQUEST = 33;
private static final int FORTH_REQUEST = 44;
=======
static final int FIRST_REQUEST = 11;
static final int SECOND_REQUEST = 22;
static final int THIRD_REQUEST = 33;
boolean onResultCalled = false;
boolean onResultWithDataCalled = false;
boolean onActivityResultWithResultCodeAndDataCalled = false;
boolean onActivityResultWithDataAndResultCodeCalled = false;
boolean onResultWithIntResultCodeCalled = false;
boolean onResultWithIntegerResultCodeCalled = false;
>>>>>>>
private static final int FIRST_REQUEST = 11;
private static final int SECOND_REQUEST = 22;
private static final int THIRD_REQUEST = 33;
private static final int FORTH_REQUEST = 44;
boolean onResultCalled = false;
boolean onResultWithDataCalled = false;
boolean onActivityResultWithResultCodeAndDataCalled = false;
boolean onActivityResultWithDataAndResultCodeCalled = false;
boolean onResultWithIntResultCodeCalled = false;
boolean onResultWithIntegerResultCodeCalled = false; |
<<<<<<<
AfterInject.class, //
=======
EService.class, //
EReceiver.class, //
EProvider.class, //
>>>>>>>
AfterInject.class, //
EService.class, //
EReceiver.class, //
EProvider.class, // |
<<<<<<<
import org.apache.synapse.messageflowtracer.processors.MessageFlowTracingDataCollector;
=======
import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector;
>>>>>>>
import org.apache.synapse.messageflowtracer.processors.MessageFlowTracingDataCollector;
import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector;
<<<<<<<
if(MessageFlowTracingDataCollector.isMessageFlowTracingEnabled(synCtx)) {
this.setTraceFlow(synCtx, componentId, getReportingName(), false);
}
=======
if (isStatisticCollected()) {
RuntimeStatisticCollector
.reportStatisticForEndpoint(synCtx, endpointId, getStatisticReportingName(), true, false);
} else {
RuntimeStatisticCollector
.reportStatisticForEndpoint(synCtx, null, getStatisticReportingName(), false, false);
}
>>>>>>>
if (MessageFlowTracingDataCollector.isMessageFlowTracingEnabled(synCtx)) {
this.setTraceFlow(synCtx, componentId, getReportingName(), false);
if (isStatisticCollected()) {
RuntimeStatisticCollector
.reportStatisticForEndpoint(synCtx, endpointId, getReportingName(), true, false);
} else {
RuntimeStatisticCollector
.reportStatisticForEndpoint(synCtx, null, getReportingName(), false, false);
}
}
<<<<<<<
public String setTraceFlow(MessageContext msgCtx, String mediatorId, String mediatorName, boolean isStart) {
return MessageFlowTracingDataCollector.setTraceFlowEvent(msgCtx, mediatorId, mediatorName, isStart);
}
public String getReportingName() {
if (this.endpointName != null) {
return this.endpointName;
} else {
return SynapseConstants.ANONYMOUS_ENDPOINT;
}
}
=======
public String getStatisticReportingName() {
if (this.endpointName != null) {
return this.endpointName;
} else {
return SynapseConstants.ANONYMOUS_ENDPOINT;
}
}
private boolean isStatisticCollected() {
return (RuntimeStatisticCollector.isStatisticsEnable() && definition.getAspectConfiguration() != null &&
definition.getAspectConfiguration().isStatisticsEnable() &&
this.endpointName != null);
}
>>>>>>>
public String setTraceFlow(MessageContext msgCtx, String mediatorId, String mediatorName, boolean isStart) {
return MessageFlowTracingDataCollector.setTraceFlowEvent(msgCtx, mediatorId, mediatorName, isStart);
}
public String getReportingName() {
if (this.endpointName != null) {
return this.endpointName;
} else {
return SynapseConstants.ANONYMOUS_ENDPOINT;
}
}
private boolean isStatisticCollected() {
return (RuntimeStatisticCollector.isStatisticsEnable() && definition.getAspectConfiguration() != null &&
definition.getAspectConfiguration().isStatisticsEnable() &&
this.endpointName != null);
} |
<<<<<<<
import org.apache.synapse.messageflowtracer.processors.MessageFlowTracingDataCollector;
=======
import org.apache.synapse.aspects.flow.statistics.store.CompletedStatisticStore;
import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector;
>>>>>>>
import org.apache.synapse.messageflowtracer.processors.MessageFlowTracingDataCollector;
import org.apache.synapse.aspects.flow.statistics.store.CompletedStatisticStore;
import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector;
<<<<<<<
if (MessageFlowTracingDataCollector.isMessageFlowTracingEnabled()) {
MessageFlowTracingDataCollector.setEntryPoint(synCtx,
MessageFlowTracerConstants.ENTRY_TYPE_INBOUND_ENDPOINT +
synCtx.getProperty("inbound.endpoint.name"),
synCtx.getMessageID());
}
=======
boolean inboundStatistics = false;
String inboundName = null;
>>>>>>>
if (MessageFlowTracingDataCollector.isMessageFlowTracingEnabled()) {
MessageFlowTracingDataCollector.setEntryPoint(synCtx,
MessageFlowTracerConstants.ENTRY_TYPE_INBOUND_ENDPOINT +
synCtx.getProperty("inbound.endpoint.name"),
synCtx.getMessageID());
}
boolean inboundStatistics = false;
String inboundName = null; |
<<<<<<<
import org.apache.synapse.aspects.ComponentType;
import org.apache.synapse.aspects.newstatistics.event.reader.StatisticEventReceiver;
import org.apache.synapse.aspects.newstatistics.log.templates.CreateEntryStatisticLog;
import org.apache.synapse.aspects.newstatistics.log.templates.StatisticCloseLog;
import org.apache.synapse.aspects.newstatistics.log.templates.StatisticReportingLog;
=======
import org.apache.synapse.debug.constructs.SynapseMediationFlowPoint;
>>>>>>>
import org.apache.synapse.aspects.ComponentType;
import org.apache.synapse.aspects.newstatistics.event.reader.StatisticEventReceiver;
import org.apache.synapse.aspects.newstatistics.log.templates.CreateEntryStatisticLog;
import org.apache.synapse.aspects.newstatistics.log.templates.StatisticCloseLog;
import org.apache.synapse.aspects.newstatistics.log.templates.StatisticReportingLog;
import org.apache.synapse.debug.constructs.SynapseMediationFlowPoint;
<<<<<<<
/**
* Returns name of the mediator
*
* @return mediator name
*/
public String getMediatorName() {
String cls = getClass().getName();
return cls.substring(cls.lastIndexOf(".") + 1);
}
/**
* Report statistics for the mediator
*
* @param messageContext message context
* @param parentName sequence name that mediator belong to
* @param isCreateLog whether this is a start or end of a mediator execution
*/
public void reportStatistic(MessageContext messageContext, String parentName, boolean isCreateLog) {
Boolean isStatCollected = (Boolean) messageContext.getProperty(SynapseConstants.NEW_STATISTICS_IS_COLLECTED);
StatisticReportingLog statisticLog;
if (isStatCollected != null) {
if (isStatCollected) {
if (isCreateLog) {
statisticLog =
new CreateEntryStatisticLog(messageContext, getMediatorName(), ComponentType.MEDIATOR,
parentName, System.currentTimeMillis());
} else {
statisticLog = new StatisticCloseLog(messageContext, getMediatorName(), parentName,
System.currentTimeMillis());
}
StatisticEventReceiver.receive(statisticLog);
}
}
}
=======
public void registerMediationFlowPoint(SynapseMediationFlowPoint flowPoint){this.flowPoint=flowPoint;}
public void unregisterMediationFlowPoint(){if(this.flowPoint!=null)this.flowPoint=null;}
public SynapseMediationFlowPoint getRegisteredMediationFlowPoint(){return flowPoint;}
public boolean isBreakPoint(){return isBreakPoint;}
public boolean isSkipEnabled(){return isSkipEnabled;}
public void setBreakPoint(boolean isBreakPoint){this.isBreakPoint=isBreakPoint;}
public void setSkipEnabled(boolean isSkipEnabled){this.isSkipEnabled=isSkipEnabled;}
>>>>>>>
/**
* Returns name of the mediator
*
* @return mediator name
*/
public String getMediatorName() {
String cls = getClass().getName();
return cls.substring(cls.lastIndexOf(".") + 1);
}
/**
* Report statistics for the mediator
*
* @param messageContext message context
* @param parentName sequence name that mediator belong to
* @param isCreateLog whether this is a start or end of a mediator execution
*/
public void reportStatistic(MessageContext messageContext, String parentName, boolean isCreateLog) {
Boolean isStatCollected = (Boolean) messageContext.getProperty(SynapseConstants.NEW_STATISTICS_IS_COLLECTED);
StatisticReportingLog statisticLog;
if (isStatCollected != null) {
if (isStatCollected) {
if (isCreateLog) {
statisticLog =
new CreateEntryStatisticLog(messageContext, getMediatorName(), ComponentType.MEDIATOR,
parentName, System.currentTimeMillis());
} else {
statisticLog = new StatisticCloseLog(messageContext, getMediatorName(), parentName,
System.currentTimeMillis());
}
StatisticEventReceiver.receive(statisticLog);
}
}
}
public void registerMediationFlowPoint(SynapseMediationFlowPoint flowPoint){this.flowPoint=flowPoint;}
public void unregisterMediationFlowPoint(){if(this.flowPoint!=null)this.flowPoint=null;}
public SynapseMediationFlowPoint getRegisteredMediationFlowPoint(){return flowPoint;}
public boolean isBreakPoint(){return isBreakPoint;}
public boolean isSkipEnabled(){return isSkipEnabled;}
public void setBreakPoint(boolean isBreakPoint){this.isBreakPoint=isBreakPoint;}
public void setSkipEnabled(boolean isSkipEnabled){this.isSkipEnabled=isSkipEnabled;} |
<<<<<<<
private String getTenantDomain(SynapseEnvironment synapseEnvironment) {
TenantInfoConfigurator configurator = synapseEnvironment.getTenantInfoConfigurator();
if (configurator != null) {
org.apache.axis2.context.MessageContext axisMessageContext = new org.apache.axis2.context.MessageContext();
MessageContext messageContext = new Axis2MessageContext(axisMessageContext, this, synapseEnvironment);
configurator.extractTenantInfo(messageContext);
if (messageContext.getProperty("tenant.info.domain") != null) {
return (String) messageContext.getProperty("tenant.info.domain");
}
}
return null;
}
=======
/**
* Returns CommentedText List
*
* @return ArrayList of String contains commented text segments
*/
public List<String> getCommentedTextList() {
return commentedTextList;
}
/**
* Add new comment text entry to the existing list*
*
* @param comment String comment
*/
public void addToCommentedTextList(String comment) {
if (comment != null && comment.length() > 0) {
this.commentedTextList.add(comment);
}
}
>>>>>>>
private String getTenantDomain(SynapseEnvironment synapseEnvironment) {
TenantInfoConfigurator configurator = synapseEnvironment.getTenantInfoConfigurator();
if (configurator != null) {
org.apache.axis2.context.MessageContext axisMessageContext = new org.apache.axis2.context.MessageContext();
MessageContext messageContext = new Axis2MessageContext(axisMessageContext, this, synapseEnvironment);
configurator.extractTenantInfo(messageContext);
if (messageContext.getProperty("tenant.info.domain") != null) {
return (String) messageContext.getProperty("tenant.info.domain");
}
}
return null;
}
/**
* Returns CommentedText List
*
* @return ArrayList of String contains commented text segments
*/
public List<String> getCommentedTextList() {
return commentedTextList;
}
/**
* Add new comment text entry to the existing list*
*
* @param comment String comment
*/
public void addToCommentedTextList(String comment) {
if (comment != null && comment.length() > 0) {
this.commentedTextList.add(comment);
}
} |
<<<<<<<
import org.apache.http.*;
=======
import org.apache.http.ConnectionClosedException;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.Header;
import org.apache.http.HttpException;
import org.apache.http.HttpInetConnection;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.auth.Credentials;
>>>>>>>
import org.apache.http.ConnectionClosedException;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.Header;
import org.apache.http.HttpException;
import org.apache.http.HttpInetConnection;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
<<<<<<<
import org.apache.synapse.transport.http.conn.ProxyConfig;
=======
>>>>>>>
import org.apache.synapse.transport.http.conn.ProxyConfig; |
<<<<<<<
=======
if(synCtx.getEnvironment().isDebugEnabled()) {
SynapseDebugManager debugManager = synCtx.getEnvironment().getSynapseDebugManager();
debugManager.acquireMediationFlowLock();
debugManager.advertiseMediationFlowStartPoint(synCtx);
}
>>>>>>>
if(synCtx.getEnvironment().isDebugEnabled()) {
SynapseDebugManager debugManager = synCtx.getEnvironment().getSynapseDebugManager();
debugManager.acquireMediationFlowLock();
debugManager.advertiseMediationFlowStartPoint(synCtx);
}
<<<<<<<
//Statistic reporting
boolean isOutOnly = Boolean.parseBoolean(String.valueOf(synCtx.getProperty(SynapseConstants.OUT_ONLY)));
if (!isOutOnly) {
isOutOnly =
(!Boolean.parseBoolean(String.valueOf(synCtx.getProperty(SynapseConstants.SENDING_REQUEST))) &&
!synCtx.isResponse());
}
if (isOutOnly) {
reportStatistics(false, synCtx);
}
=======
if(synCtx.getEnvironment().isDebugEnabled()) {
SynapseDebugManager debugManager = synCtx.getEnvironment().getSynapseDebugManager();
debugManager.advertiseMediationFlowTerminatePoint(synCtx);
debugManager.releaseMediationFlowLock();
}
>>>>>>>
//Statistic reporting
boolean isOutOnly = Boolean.parseBoolean(String.valueOf(synCtx.getProperty(SynapseConstants.OUT_ONLY)));
if (!isOutOnly) {
isOutOnly =
(!Boolean.parseBoolean(String.valueOf(synCtx.getProperty(SynapseConstants.SENDING_REQUEST))) &&
!synCtx.isResponse());
}
if (isOutOnly) {
reportStatistics(false, synCtx);
}
if(synCtx.getEnvironment().isDebugEnabled()) {
SynapseDebugManager debugManager = synCtx.getEnvironment().getSynapseDebugManager();
debugManager.advertiseMediationFlowTerminatePoint(synCtx);
debugManager.releaseMediationFlowLock();
} |
<<<<<<<
import org.apache.synapse.messageflowtracer.processors.MessageFlowTracingDataCollector;
=======
import org.apache.synapse.aspects.ComponentType;
import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector;
>>>>>>>
import org.apache.synapse.messageflowtracer.processors.MessageFlowTracingDataCollector;
import org.apache.synapse.aspects.ComponentType;
import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector;
<<<<<<<
=======
isAggregateComplete = onCompleteSeqResult;
>>>>>>>
isAggregateComplete = onCompleteSeqResult; |
<<<<<<<
import com.duckduckgo.mobile.android.DDGApplication;
import com.duckduckgo.mobile.android.activity.DuckDuckGo;
import com.duckduckgo.mobile.android.util.PreferencesManager;
import info.guardianproject.onionkit.trust.StrongHttpsClient;
import info.guardianproject.onionkit.web.WebkitProxy;
=======
import java.io.InputStream;
import java.security.KeyStore;
import javax.net.ssl.HttpsURLConnection;
import android.content.Context;
>>>>>>>
import java.io.InputStream;
import java.security.KeyStore;
import javax.net.ssl.HttpsURLConnection;
import android.content.Context;
import com.duckduckgo.mobile.android.DDGApplication;
import com.duckduckgo.mobile.android.activity.DuckDuckGo;
import com.duckduckgo.mobile.android.util.PreferencesManager;
import info.guardianproject.onionkit.trust.StrongHttpsClient;
import info.guardianproject.onionkit.web.WebkitProxy;
<<<<<<<
import ch.boye.httpclientandroidlib.conn.params.ConnRoutePNames;
import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
=======
import ch.boye.httpclientandroidlib.conn.scheme.PlainSocketFactory;
import ch.boye.httpclientandroidlib.conn.scheme.Scheme;
import ch.boye.httpclientandroidlib.conn.scheme.SchemeRegistry;
import ch.boye.httpclientandroidlib.conn.ssl.SSLSocketFactory;
>>>>>>>
import ch.boye.httpclientandroidlib.conn.scheme.PlainSocketFactory;
import ch.boye.httpclientandroidlib.conn.scheme.Scheme;
import ch.boye.httpclientandroidlib.conn.scheme.SchemeRegistry;
import ch.boye.httpclientandroidlib.conn.ssl.SSLSocketFactory;
import ch.boye.httpclientandroidlib.conn.params.ConnRoutePNames;
import ch.boye.httpclientandroidlib.impl.client.DefaultHttpClient;
<<<<<<<
public static DDGHttpClient mainClient = null;
private static ClientConnectionManager mainConnManager = null;
private static HttpParams httpParams = new BasicHttpParams();
private final static String PROXY_HOST = "127.0.0.1";
private final static int PROXY_HTTP_PORT = 8118; // default for Orbot/Tor
=======
public static DDGHttpClient mainClient;
private static ClientConnectionManager mainConnManager;
private static HttpParams httpParams = new BasicHttpParams();
>>>>>>>
public static DDGHttpClient mainClient;
private static ClientConnectionManager mainConnManager;
private static HttpParams httpParams = new BasicHttpParams();
private final static String PROXY_HOST = "127.0.0.1";
private final static int PROXY_HTTP_PORT = 8118; // default for Orbot/Tor
<<<<<<<
public static void initialize(DDGApplication application){
=======
public static void initialize(Context context){
>>>>>>>
public static void initialize(DDGApplication application){
<<<<<<<
mainConnManager = new ThreadSafeClientConnManager();
mainClient = new DDGHttpClient(application.getApplicationContext(), mainConnManager, httpParams);
if(PreferencesManager.getEnableTor()){
mainClient.getStrongTrustManager().setNotifyVerificationFail(true);
mainClient.getStrongTrustManager().setNotifyVerificationSuccess(true);
mainClient.useProxy(true, ConnRoutePNames.DEFAULT_PROXY, PROXY_HOST, PROXY_HTTP_PORT);
}
=======
mainConnManager = new ThreadSafeClientConnManager(schemeRegistry);
mainClient = new DDGHttpClient(mainConnManager, httpParams);
>>>>>>>
mainConnManager = new ThreadSafeClientConnManager(schemeRegistry);
mainClient = new DDGHttpClient(application.getApplicationContext(), mainConnManager, httpParams);
if(PreferencesManager.getEnableTor()){
mainClient.getStrongTrustManager().setNotifyVerificationFail(true);
mainClient.getStrongTrustManager().setNotifyVerificationSuccess(true);
mainClient.useProxy(true, ConnRoutePNames.DEFAULT_PROXY, PROXY_HOST, PROXY_HTTP_PORT);
} |
<<<<<<<
private static final String STEPS = "steps";
=======
public static final String ACTIONS = "actions";
>>>>>>>
public static final String STEPS = "steps";
public static final String ACTIONS = "actions"; |
<<<<<<<
public Long getEstimatedDurationInMillis() {
return mbp.getEstimatedDuration();
}
@Override
=======
public String getLastSuccessfulRun() {
return null;
}
@Override
>>>>>>>
public Long getEstimatedDurationInMillis() {
return mbp.getEstimatedDuration();
}
@Override
public String getLastSuccessfulRun() {
return null;
}
@Override |
<<<<<<<
import io.jenkins.blueocean.rest.Navigable;
=======
import org.kohsuke.stapler.WebMethod;
>>>>>>>
import io.jenkins.blueocean.rest.Navigable;
import org.kohsuke.stapler.WebMethod; |
<<<<<<<
import hudson.Extension;
import hudson.tasks.Mailer;
=======
import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
>>>>>>>
import hudson.Extension;
import hudson.tasks.Mailer;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
<<<<<<<
import io.jenkins.blueocean.api.profile.model.UserDetails;
import io.jenkins.blueocean.commons.ServiceException;
import io.jenkins.blueocean.security.Identity;
import io.jenkins.blueocean.security.LoginDetails;
=======
import io.jenkins.blueocean.commons.ServiceException;
import io.jenkins.blueocean.commons.ServiceException.NotFoundException;
import io.jenkins.blueocean.security.Credentials;
import io.jenkins.blueocean.security.Identity;
import io.jenkins.blueocean.service.embedded.properties.CredentialsProperty;
>>>>>>>
import io.jenkins.blueocean.api.profile.model.UserDetails;
import io.jenkins.blueocean.commons.ServiceException;
import io.jenkins.blueocean.security.Identity;
import io.jenkins.blueocean.security.LoginDetails;
import io.jenkins.blueocean.commons.ServiceException;
import io.jenkins.blueocean.commons.ServiceException.NotFoundException;
import io.jenkins.blueocean.security.Credentials;
import io.jenkins.blueocean.security.Identity;
import io.jenkins.blueocean.service.embedded.properties.CredentialsProperty; |
<<<<<<<
@Override
public Container<?> getSteps() {
return null;
}
protected static BlueRun getBlueRun(Run r){
=======
@Override
public Collection<?> getActions() {
List<BlueActionProxy> actionProxies = new ArrayList<>();
for(Action action:run.getAllActions()){
if(!action.getClass().isAnnotationPresent(ExportedBean.class)){
continue;
}
actionProxies.add(new ActionProxiesImpl(action, this));
}
return actionProxies;
}
protected static BlueRun getBlueRun(Run r, Link parent){
>>>>>>>
@Override
public Container<?> getSteps() {
return null;
}
public Collection<?> getActions() {
List<BlueActionProxy> actionProxies = new ArrayList<>();
for(Action action:run.getAllActions()){
if(!action.getClass().isAnnotationPresent(ExportedBean.class)){
continue;
}
actionProxies.add(new ActionProxiesImpl(action, this));
}
return actionProxies;
}
protected static BlueRun getBlueRun(Run r, Link parent){ |
<<<<<<<
import io.jenkins.blueocean.service.embedded.rest.PipelineNodeUtil;
=======
import jenkins.branch.MultiBranchProject;
>>>>>>>
import io.jenkins.blueocean.service.embedded.rest.PipelineNodeUtil;
import jenkins.branch.MultiBranchProject; |
<<<<<<<
public static final String TOTAL_NUMBER_OF_PULL_REQUESTS="totalNumberOfPullRequests";
public static final String NUMBER_OF_FAILING_PULL_REQUESTS="numberOfFailingPullRequests";
public static final String NUMBER_OF_SUCCESSFULT_PULL_REQUESTS="numberOfSuccessfulPullRequests";
public static final String PRIMARY_BRANCH_WEATHER="primaryBranchWeather";
=======
>>>>>>>
public static final String TOTAL_NUMBER_OF_PULL_REQUESTS="totalNumberOfPullRequests";
public static final String NUMBER_OF_FAILING_PULL_REQUESTS="numberOfFailingPullRequests";
public static final String NUMBER_OF_SUCCESSFULT_PULL_REQUESTS="numberOfSuccessfulPullRequests";
<<<<<<<
* @return total number of pull requests
*/
@JsonProperty(TOTAL_NUMBER_OF_BRANCHES)
@Exported(name = TOTAL_NUMBER_OF_PULL_REQUESTS)
public abstract int getTotalNumberOfPullRequests();
/**
* @return total number of pull requests
*/
@JsonProperty(NUMBER_OF_FAILING_BRANCHES)
@Exported(name = NUMBER_OF_FAILING_PULL_REQUESTS)
public abstract int getNumberOfFailingPullRequests();
/**
* @return total number of pull requests
*/
@JsonProperty(NUMBER_OF_SUCCESSFULT_BRANCHES)
@Exported(name = NUMBER_OF_SUCCESSFULT_PULL_REQUESTS)
public abstract int getNumberOfSuccessfulPullRequests();
/**
* @return Primary branch weather score
*/
@Exported(name = PRIMARY_BRANCH_WEATHER)
@JsonProperty(PRIMARY_BRANCH_WEATHER)
public abstract int getMasterBranchStatusPercentile();
/**
=======
>>>>>>>
* @return total number of pull requests
*/
@JsonProperty(TOTAL_NUMBER_OF_BRANCHES)
@Exported(name = TOTAL_NUMBER_OF_PULL_REQUESTS)
public abstract int getTotalNumberOfPullRequests();
/**
* @return total number of pull requests
*/
@JsonProperty(NUMBER_OF_FAILING_BRANCHES)
@Exported(name = NUMBER_OF_FAILING_PULL_REQUESTS)
public abstract int getNumberOfFailingPullRequests();
/**
* @return total number of pull requests
*/
@JsonProperty(NUMBER_OF_SUCCESSFULT_BRANCHES)
@Exported(name = NUMBER_OF_SUCCESSFULT_PULL_REQUESTS)
public abstract int getNumberOfSuccessfulPullRequests();
/** |
<<<<<<<
import static com.atlassian.jira.instrumentation.InstrumentationName.QUICKSEARCH_CONCURRENT_REQUESTS;
import static java.time.Instant.now;
import static java.util.Collections.emptyList;
import static java.util.Objects.nonNull;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
=======
>>>>>>>
import static com.atlassian.jira.instrumentation.InstrumentationName.QUICKSEARCH_CONCURRENT_REQUESTS;
import static java.time.Instant.now;
import static java.util.Collections.emptyList;
import static java.util.Objects.nonNull;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
<<<<<<<
result.addAll(concurrentQuicksearchesGauge.collect());
=======
result.addAll(mailQueueGauge.collect());
>>>>>>>
result.addAll(concurrentQuicksearchesGauge.collect());
result.addAll(mailQueueGauge.collect()); |
<<<<<<<
import java.util.ArrayList;
=======
import java.text.ParseException;
import java.util.Calendar;
>>>>>>>
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar; |
<<<<<<<
private static class BranchAndSide implements Comparable<BranchAndSide> {
private final Branch branch;
private final Branch.Side side;
=======
private static final class BranchAndSide implements Comparable<BranchAndSide> {
private final TwoTerminalsConnectable branch;
private final TwoTerminalsConnectable.Side side;
>>>>>>>
private static final class BranchAndSide implements Comparable<BranchAndSide> {
private final Branch branch;
private final Branch.Side side;
<<<<<<<
public Branch getBranch() {
=======
private TwoTerminalsConnectable getBranch() {
>>>>>>>
private Branch getBranch() {
<<<<<<<
public Branch.Side getSide() {
=======
private TwoTerminalsConnectable.Side getSide() {
>>>>>>>
private Branch.Side getSide() { |
<<<<<<<
=======
import com.jetbrains.jetpad.vclang.term.definition.DataDefinition;
import com.jetbrains.jetpad.vclang.term.definition.TypeUniverse;
>>>>>>>
import com.jetbrains.jetpad.vclang.term.definition.TypeUniverse;
<<<<<<<
for (ConCallExpression conCall : ftype.getDefinition().getMatchedConstructors(parameters)) {
if (myResultType.getType().toUniverse().getUniverse().lessOrEquals(new Universe.Type(0, Universe.Type.PROP))) {
=======
for (ConCallExpression conCall : ((DataDefinition)ftype.getDefinition()).getMatchedConstructors(parameters)) {
Universe.CompareResult cmpProp = ((UniverseExpression) myResultType.getType()).getUniverse().compare(TypeUniverse.PROP, null);
Universe.CompareResult cmpSet = ((UniverseExpression) myResultType.getType()).getUniverse().compare(TypeUniverse.SET, null);
if (cmpProp != null && cmpProp.Result == Universe.Cmp.EQUALS) {
>>>>>>>
for (ConCallExpression conCall : ftype.getDefinition().getMatchedConstructors(parameters)) {
Universe.CompareResult cmpProp = ((UniverseExpression) myResultType.getType()).getUniverse().compare(TypeUniverse.PROP, null);
Universe.CompareResult cmpSet = ((UniverseExpression) myResultType.getType()).getUniverse().compare(TypeUniverse.SET, null);
if (cmpProp != null && cmpProp.Result == Universe.Cmp.EQUALS) {
<<<<<<<
} else if (myResultType.getType().toUniverse().getUniverse().lessOrEquals(new Universe.Type(0, Universe.Type.SET))) {
=======
} else if (cmpSet != null && cmpSet.isLessOrEquals()) {
>>>>>>>
} else if (cmpSet != null && cmpSet.isLessOrEquals()) { |
<<<<<<<
import com.jetbrains.jetpad.vclang.naming.namespace.SimpleNamespace;
=======
import com.jetbrains.jetpad.vclang.naming.ModuleResolvedName;
import com.jetbrains.jetpad.vclang.naming.Namespace;
import com.jetbrains.jetpad.vclang.naming.NamespaceMember;
>>>>>>>
import com.jetbrains.jetpad.vclang.naming.namespace.SimpleNamespace;
import com.jetbrains.jetpad.vclang.naming.ModuleResolvedName;
import com.jetbrains.jetpad.vclang.naming.Namespace;
import com.jetbrains.jetpad.vclang.naming.NamespaceMember;
<<<<<<<
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
=======
import java.util.Collection;
import java.util.EnumSet;
>>>>>>>
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
import java.util.Collection;
import java.util.EnumSet;
<<<<<<<
PRELUDE_CLASS = new ClassDefinition("Prelude", PRELUDE);
/* Nat, zero, suc */
DefinitionBuilder.Data nat = new DefinitionBuilder.Data(PRELUDE, "Nat", Abstract.Binding.DEFAULT_PRECEDENCE, new Universe.Type(0, Universe.Type.SET), EmptyDependentLink.getInstance());
NAT = nat.definition();
ZERO = nat.addConstructor("zero", Abstract.Binding.DEFAULT_PRECEDENCE, new Universe.Type(0, Universe.Type.PROP), EmptyDependentLink.getInstance());
SUC = nat.addConstructor("suc", Abstract.Binding.DEFAULT_PRECEDENCE, new Universe.Type(0, Universe.Type.SET), param(DataCall(NAT)));
/* I, left, right */
DefinitionBuilder.Data interval = new DefinitionBuilder.Data(PRELUDE, "I", Abstract.Binding.DEFAULT_PRECEDENCE, new Universe.Type(0, Universe.Type.PROP), EmptyDependentLink.getInstance());
INTERVAL = interval.definition();
LEFT = interval.addConstructor("left", Abstract.Binding.DEFAULT_PRECEDENCE, new Universe.Type(0, Universe.Type.PROP), EmptyDependentLink.getInstance());
RIGHT = interval.addConstructor("right", Abstract.Binding.DEFAULT_PRECEDENCE, new Universe.Type(0, Universe.Type.PROP), EmptyDependentLink.getInstance());
ABSTRACT = interval.addConstructor("<abstract>", Abstract.Binding.DEFAULT_PRECEDENCE, new Universe.Type(0, Universe.Type.PROP), EmptyDependentLink.getInstance());
/* isoP */
DependentLink isoParameter1 = param(false, vars("A", "B"), Universe(0, Universe.Type.PROP));
DependentLink isoParameter2 = param("f", Pi(param(Reference(isoParameter1)), Reference(isoParameter1.getNext())));
DependentLink isoParameter3 = param("g", Pi(param(Reference(isoParameter1.getNext())), Reference(isoParameter1)));
DependentLink isoParameter4 = param("i", DataCall(INTERVAL));
isoParameter1.setNext(isoParameter2);
isoParameter2.setNext(isoParameter3);
isoParameter3.setNext(isoParameter4);
Expression isoResultType = Universe(0, Universe.Type.PROP);
ElimTreeNode isoElimTree = top(isoParameter1, branch(isoParameter4, tail(),
clause(LEFT, EmptyDependentLink.getInstance(), Reference(isoParameter1)),
clause(RIGHT, EmptyDependentLink.getInstance(), Reference(isoParameter1.getNext()))
));
new DefinitionBuilder.Function(PRELUDE, "isoP", Abstract.Binding.DEFAULT_PRECEDENCE, isoParameter1, isoResultType, isoElimTree);
generateLevel(0);
PATH = (DataDefinition) levels.get(0).path;
PATH_CON = (Constructor) levels.get(0).pathCon;
PATH_INFIX = (FunctionDefinition) levels.get(0).pathInfix;
AT = (FunctionDefinition) levels.get(0).at;
ISO = (FunctionDefinition) levels.get(0).iso;
COERCE = (FunctionDefinition) levels.get(0).coe;
}
private Prelude() {
}
@Override
public Referable resolveName(String name) {
Referable result = super.resolveName(name);
if (result != null)
return result;
for (char sc : specInfix) {
if (name.charAt(0) == sc) {
for (char c : name.toCharArray()) {
if (sc != c)
return null;
}
generateLevel(name.length() - 1);
return resolveName(name);
}
}
for (String sname : specPrefix) {
if (name.startsWith(sname)) {
if (name.length() == sname.length()) {
generateLevel(0);
return resolveName(name);
}
String suffix = name.substring(sname.length());
try {
Integer level = Integer.parseInt(suffix);
if (level > 0) {
generateLevel(level);
return resolveName(name);
}
} catch (NumberFormatException e) {
return null;
}
}
}
return null;
}
private static void generateLevel(int i) {
String suffix = i == 0 ? "" : Integer.toString(i);
/* Path, path */
DependentLink PathParameter1 = param("A", Pi(param(DataCall(INTERVAL)), Universe(i, Universe.Type.NOT_TRUNCATED)));
DependentLink PathParameter2 = param("a", Apps(Reference(PathParameter1), ConCall(LEFT)));
DependentLink PathParameter3 = param("a'", Apps(Reference(PathParameter1), ConCall(RIGHT)));
=======
PRELUDE_CLASS = new ClassDefinition(new ModuleResolvedName(moduleID), null);
Preprelude.setUniverses();
/* Path */
DependentLink PathParameter1 = param(false, "lp", Lvl());
DependentLink PathParameter2 = param(false, "lh", CNat());
DependentLink PathParameter3 = param("A", Pi(param(Interval()), Universe(Reference(PathParameter1), Reference(PathParameter2))));
DependentLink PathParameter4 = param("a", Apps(Reference(PathParameter3), Left()));
DependentLink PathParameter5 = param("a'", Apps(Reference(PathParameter3), Right()));
>>>>>>>
PRELUDE_CLASS = new ClassDefinition("Prelude", PRELUDE);
Preprelude.setUniverses();
/* Path */
DependentLink PathParameter1 = param(false, "lp", Lvl());
DependentLink PathParameter2 = param(false, "lh", CNat());
DependentLink PathParameter3 = param("A", Pi(param(Interval()), Universe(Reference(PathParameter1), Reference(PathParameter2))));
DependentLink PathParameter4 = param("a", Apps(Reference(PathParameter3), Left()));
DependentLink PathParameter5 = param("a'", Apps(Reference(PathParameter3), Right()));
<<<<<<<
Expression pathInfixTerm = Apps(DataCall(path.definition()), Lam(param("_", DataCall(INTERVAL)), Reference(pathInfixParameter1)), Reference(pathInfixParameter2), Reference(pathInfixParameter2.getNext()));
Arrays.fill(chars, '=');
DefinitionBuilder.Function pathInfix = new DefinitionBuilder.Function(PRELUDE, new String(chars), new Abstract.Definition.Precedence(Abstract.Binding.Associativity.NON_ASSOC, (byte) 0), pathInfixParameter1, Universe(i), top(pathInfixParameter1, leaf(pathInfixTerm)));
defToLevel.put(pathInfix.definition(), i);
DependentLink atParameter1 = param(false, "A", PathParameter1.getType());
DependentLink atParameter2 = param(false, "a", Apps(Reference(atParameter1), ConCall(LEFT)));
DependentLink atParameter3 = param(false, "a'", Apps(Reference(atParameter1), ConCall(RIGHT)));
DependentLink atParameter4 = param("p", Apps(DataCall((DataDefinition) PRELUDE.resolveName("Path" + suffix)), Reference(atParameter1), Reference(atParameter2), Reference(atParameter3)));
DependentLink atParameter5 = param("i", DataCall(INTERVAL));
=======
pathInfixParameter2.setNext(pathInfixParameter3);
pathInfixParameter3.setNext(pathInfixParameter4);
Expression pathInfixTerm = DataCall(PATH)
.addArgument(Reference(pathInfixParameter1), EnumSet.noneOf(AppExpression.Flag.class))
.addArgument(Reference(pathInfixParameter2), EnumSet.noneOf(AppExpression.Flag.class))
.addArgument(Lam(param("_", Interval()), Reference(pathInfixParameter3)), AppExpression.DEFAULT)
.addArgument(Reference(pathInfixParameter4), AppExpression.DEFAULT)
.addArgument(Reference(pathInfixParameter4.getNext()), AppExpression.DEFAULT);
PATH_INFIX = new Preprelude.DefinitionBuilder.Function(PRELUDE, "=", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.NON_ASSOC, (byte) 0), pathInfixParameter1, Universe(Reference(pathInfixParameter1), Reference(pathInfixParameter2)), top(pathInfixParameter1, leaf(pathInfixTerm))).definition();
/* @ */
DependentLink atParameter1 = param(false, "lp", Lvl());
DependentLink atParameter2 = param(false, "lh", CNat());
DependentLink atParameter3 = param(false, "A", Pi(param(Interval()), Universe(Reference(atParameter1), Reference(atParameter2))));
DependentLink atParameter4 = param(false, "a", Apps(Reference(atParameter3), Left()));
DependentLink atParameter5 = param(false, "a'", Apps(Reference(atParameter3), Right()));
DependentLink atParameter6 = param("p", Apps(DataCall(PATH), Reference(atParameter1), Reference(atParameter2), Reference(atParameter3), Reference(atParameter4), Reference(atParameter5)));
DependentLink atParameter7 = param("i", Interval());
>>>>>>>
pathInfixParameter2.setNext(pathInfixParameter3);
pathInfixParameter3.setNext(pathInfixParameter4);
Expression pathInfixTerm = DataCall(PATH)
.addArgument(Reference(pathInfixParameter1), EnumSet.noneOf(AppExpression.Flag.class))
.addArgument(Reference(pathInfixParameter2), EnumSet.noneOf(AppExpression.Flag.class))
.addArgument(Lam(param("_", Interval()), Reference(pathInfixParameter3)), AppExpression.DEFAULT)
.addArgument(Reference(pathInfixParameter4), AppExpression.DEFAULT)
.addArgument(Reference(pathInfixParameter4.getNext()), AppExpression.DEFAULT);
PATH_INFIX = new Preprelude.DefinitionBuilder.Function(PRELUDE, "=", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.NON_ASSOC, (byte) 0), pathInfixParameter1, Universe(Reference(pathInfixParameter1), Reference(pathInfixParameter2)), top(pathInfixParameter1, leaf(pathInfixTerm))).definition();
/* @ */
DependentLink atParameter1 = param(false, "lp", Lvl());
DependentLink atParameter2 = param(false, "lh", CNat());
DependentLink atParameter3 = param(false, "A", Pi(param(Interval()), Universe(Reference(atParameter1), Reference(atParameter2))));
DependentLink atParameter4 = param(false, "a", Apps(Reference(atParameter3), Left()));
DependentLink atParameter5 = param(false, "a'", Apps(Reference(atParameter3), Right()));
DependentLink atParameter6 = param("p", Apps(DataCall(PATH), Reference(atParameter1), Reference(atParameter2), Reference(atParameter3), Reference(atParameter4), Reference(atParameter5)));
DependentLink atParameter7 = param("i", Interval());
<<<<<<<
DependentLink atPath = param("f", pathParameters.getType());
Expression atResultType = Apps(Reference(atParameter1), Reference(atParameter5));
ElimTreeNode atElimTree = top(atParameter1, branch(atParameter5, tail(),
clause(LEFT, EmptyDependentLink.getInstance(), Reference(atParameter2)),
clause(RIGHT, EmptyDependentLink.getInstance(), Reference(atParameter3)),
clause(branch(atParameter4, tail(atParameter5),
clause((Constructor) PRELUDE.resolveName("path" + suffix), atPath, Apps(Reference(atPath), Reference(atParameter5)))))
=======
atParameter5.setNext(atParameter6);
atParameter6.setNext(atParameter7);
DependentLink atPath = param("f", pathParameter.getType());
Expression atResultType = Apps(Reference(atParameter3), Reference(atParameter7));
ElimTreeNode atElimTree = top(atParameter1, branch(atParameter7, tail(),
clause(Preprelude.LEFT, EmptyDependentLink.getInstance(), Reference(atParameter4)),
clause(Preprelude.RIGHT, EmptyDependentLink.getInstance(), Reference(atParameter5)),
clause(branch(atParameter6, tail(atParameter7),
clause(PATH_CON, atPath, Apps(Reference(atPath), Reference(atParameter7)))))
>>>>>>>
atParameter5.setNext(atParameter6);
atParameter6.setNext(atParameter7);
DependentLink atPath = param("f", pathParameter.getType());
Expression atResultType = Apps(Reference(atParameter3), Reference(atParameter7));
ElimTreeNode atElimTree = top(atParameter1, branch(atParameter7, tail(),
clause(Preprelude.LEFT, EmptyDependentLink.getInstance(), Reference(atParameter4)),
clause(Preprelude.RIGHT, EmptyDependentLink.getInstance(), Reference(atParameter5)),
clause(branch(atParameter6, tail(atParameter7),
clause(PATH_CON, atPath, Apps(Reference(atPath), Reference(atParameter7)))))
<<<<<<<
return defToLevel.containsKey(definition) && levels.get(defToLevel.get(definition)).truncS == definition;
}
public static int getLevel(Definition definition) {
if (defToLevel.containsKey(definition)) {
return defToLevel.get(definition);
}
throw new IllegalStateException();
}
public static LevelPoly getLevelDefs(int level) {
return levels.get(level);
}
private static class DefinitionBuilder {
static class Data {
private final SimpleNamespace myParentNs;
private final DataDefinition myDefinition;
private final SimpleNamespace myNs = new SimpleNamespace();
Data(SimpleNamespace parentNs, String name, Abstract.Binding.Precedence precedence, Universe.Type universe, DependentLink parameters) {
myParentNs = parentNs;
myDefinition = new DataDefinition(name, precedence, universe, parameters);
myParentNs.addDefinition(myDefinition);
}
DataDefinition definition() {
return myDefinition;
}
Constructor addConstructor(String name, Abstract.Binding.Precedence precedence, Universe.Type universe, DependentLink parameters) {
Constructor constructor = new Constructor(name, precedence, universe, parameters, myDefinition);
myDefinition.addConstructor(constructor);
myNs.addDefinition(constructor);
myParentNs.addDefinition(constructor);
return constructor;
}
}
static class Function {
private final FunctionDefinition myDefinition;
public Function(SimpleNamespace parentNs, String name, Abstract.Binding.Precedence precedence, DependentLink parameters, Expression resultType, ElimTreeNode elimTree) {
myDefinition = new FunctionDefinition(name, precedence, parameters, resultType, elimTree);
parentNs.addDefinition(myDefinition);
}
FunctionDefinition definition() {
return myDefinition;
}
}
=======
return SET_TRUNC_PATH_CON == definition;
>>>>>>>
return SET_TRUNC_PATH_CON == definition; |
<<<<<<<
return visitFunctionCall((Function) defCallExpr.getDefinition(), defCallExpr, args);
} else if (defCallExpr instanceof ConCallExpression) {
return visitConstructorCall((ConCallExpression) defCallExpr, args);
=======
return visitFunctionCall((Function) defCallExpr.getDefinition(), defCallExpr, args, mode);
>>>>>>>
return visitFunctionCall((Function) defCallExpr.getDefinition(), defCallExpr, args, mode);
} else if (defCallExpr instanceof ConCallExpression) {
return visitConstructorCall((ConCallExpression) defCallExpr, args, mode);
<<<<<<<
List<TypeArgument> splitArguments = splitArguments(arguments);
if (myMode == Mode.WHNF && splitArguments.size() >= args.size()) {
return applyDefCall(defCallExpr, args);
=======
List<TypeArgument> splitArguments = new ArrayList<>();
splitArguments(arguments, splitArguments);
if (mode == Mode.WHNF && splitArguments.size() >= args.size()) {
return applyDefCall(defCallExpr, args, mode);
>>>>>>>
List<TypeArgument> splitArguments = splitArguments(arguments);
if (mode == Mode.WHNF && splitArguments.size() >= args.size()) {
return applyDefCall(defCallExpr, args, mode);
<<<<<<<
private Expression visitConstructorCall(ConCallExpression conCallExpression, List<ArgumentExpression> args) {
List<TypeArgument> origArgs = conCallExpression.getDefinition().getArguments();
List<TypeArgument> arguments;
if (!conCallExpression.getParameters().isEmpty()) {
List<Expression> substExprs = new ArrayList<>(conCallExpression.getParameters());
Collections.reverse(substExprs);
arguments = new ArrayList<>(origArgs.size());
for (int j = 0; j < conCallExpression.getDefinition().getArguments().size(); ++j) {
int num;
if (origArgs.get(j) instanceof TelescopeArgument) {
arguments.add(Tele(origArgs.get(j).getExplicit(), ((TelescopeArgument) origArgs.get(j)).getNames(), origArgs.get(j).getType().subst(substExprs, 0)));
num = ((TelescopeArgument) origArgs.get(j)).getNames().size();
} else {
arguments.add(TypeArg(origArgs.get(j).getExplicit(), origArgs.get(j).getType().subst(substExprs, j)));
num = 1;
}
for (int i = 0; i < substExprs.size(); ++i) {
substExprs.set(i, substExprs.get(i).liftIndex(0, num));
}
}
} else {
arguments = origArgs;
}
int numberOfArgs = numberOfVariables(arguments);
if (myMode == Mode.WHNF && numberOfArgs > args.size()) {
return applyDefCall(conCallExpression, args);
}
List<Expression> args2 = completeArgs(args, numberOfArgs, numberOfArgs);
Expression result = null;
if (conCallExpression.getDefinition().getDataType().getConditions() != null) {
// TODO: here and in \\elim we must explicitely do the same thing
List<List<Pattern>> patterns = new ArrayList<>(numberOfArgs);
List<Expression> exprs = new ArrayList<>();
for (int i = 0; i < numberOfArgs; i++) {
patterns.add(new ArrayList<Pattern>());
exprs.add(args2.get(args2.size() - 1 - i));
}
List<Condition> conditions = new ArrayList<>();
for (Condition condition : conCallExpression.getDefinition().getDataType().getConditions()) {
if (condition.getConstructor() == conCallExpression.getDefinition()) {
conditions.add(condition);
for (int i = 0; i < numberOfArgs; i++) {
patterns.get(i).add(condition.getPatterns().get(i));
}
}
}
List<Integer> validConditions = patternMultipleMatch(patterns, exprs, myContext, conditions.size());
if (!validConditions.isEmpty()) {
Condition conditionOK = conditions.get(validConditions.get(0));
List<Expression> substExpressions = new ArrayList<>();
for (int i = 0; i < conditionOK.getPatterns().size(); i++) {
Utils.PatternMatchOKResult matchOKResult = (Utils.PatternMatchOKResult) conditionOK.getPatterns().get(i).match(args2.get(args2.size() - 1 - i), myContext);
substExpressions.addAll(matchOKResult.expressions);
}
Collections.reverse(substExpressions);
result = conditionOK.getTerm().liftIndex(0, numberOfArgs - args.size()).subst(substExpressions, 0);
}
}
if (result == null) {
return applyDefCall(conCallExpression, args);
}
result = bindExcessiveArgs(args, result, arguments, numberOfArgs, numberOfArgs);
return myMode == Mode.TOP ? result : result.accept(this);
}
private Expression visitFunctionCall(Function func, Expression defCallExpr, List<ArgumentExpression> args) {
=======
private Expression visitFunctionCall(Function func, Expression defCallExpr, List<ArgumentExpression> args, Mode mode) {
>>>>>>>
private Expression visitConstructorCall(ConCallExpression conCallExpression, List<ArgumentExpression> args, Mode mode) {
int take = conCallExpression.getDefinition().getNumberOfAllParameters() - conCallExpression.getParameters().size();
if (take > 0) {
int to = args.size() - take;
if (to < 0) {
to = 0;
}
List<Expression> parameters = new ArrayList<>(conCallExpression.getParameters().size() + args.size() - to);
parameters.addAll(conCallExpression.getParameters());
for (int i = args.size() - 1; i >= to; --i) {
parameters.add(args.get(i).getExpression());
}
args = args.subList(0, to);
conCallExpression = ConCall(conCallExpression.getDefinition(), parameters);
}
// TODO: what if the list of parameters is still incomplete?
List<TypeArgument> origArgs = conCallExpression.getDefinition().getArguments();
List<TypeArgument> arguments;
if (!conCallExpression.getParameters().isEmpty()) {
List<Expression> substExprs = new ArrayList<>(conCallExpression.getParameters());
Collections.reverse(substExprs);
arguments = new ArrayList<>(origArgs.size());
for (int j = 0; j < conCallExpression.getDefinition().getArguments().size(); ++j) {
int num;
if (origArgs.get(j) instanceof TelescopeArgument) {
arguments.add(Tele(origArgs.get(j).getExplicit(), ((TelescopeArgument) origArgs.get(j)).getNames(), origArgs.get(j).getType().subst(substExprs, 0)));
num = ((TelescopeArgument) origArgs.get(j)).getNames().size();
} else {
arguments.add(TypeArg(origArgs.get(j).getExplicit(), origArgs.get(j).getType().subst(substExprs, j)));
num = 1;
}
for (int i = 0; i < substExprs.size(); ++i) {
substExprs.set(i, substExprs.get(i).liftIndex(0, num));
}
}
} else {
arguments = origArgs;
}
int numberOfArgs = numberOfVariables(arguments);
if (mode == Mode.WHNF && numberOfArgs > args.size()) {
return applyDefCall(conCallExpression, args, mode);
}
List<Expression> args2 = completeArgs(args, numberOfArgs, numberOfArgs);
Expression result = null;
if (conCallExpression.getDefinition().getDataType().getConditions() != null) {
// TODO: here and in \\elim we must explicitely do the same thing
List<List<Pattern>> patterns = new ArrayList<>(numberOfArgs);
List<Expression> exprs = new ArrayList<>();
for (int i = 0; i < numberOfArgs; i++) {
patterns.add(new ArrayList<Pattern>());
exprs.add(args2.get(args2.size() - 1 - i));
}
List<Condition> conditions = new ArrayList<>();
for (Condition condition : conCallExpression.getDefinition().getDataType().getConditions()) {
if (condition.getConstructor() == conCallExpression.getDefinition()) {
conditions.add(condition);
for (int i = 0; i < numberOfArgs; i++) {
patterns.get(i).add(condition.getPatterns().get(i));
}
}
}
List<Integer> validConditions = patternMultipleMatch(patterns, exprs, myContext, conditions.size());
if (!validConditions.isEmpty()) {
Condition conditionOK = conditions.get(validConditions.get(0));
List<Expression> substExpressions = new ArrayList<>();
for (int i = 0; i < conditionOK.getPatterns().size(); i++) {
Utils.PatternMatchOKResult matchOKResult = (Utils.PatternMatchOKResult) conditionOK.getPatterns().get(i).match(args2.get(args2.size() - 1 - i), myContext);
substExpressions.addAll(matchOKResult.expressions);
}
Collections.reverse(substExpressions);
result = conditionOK.getTerm().liftIndex(0, numberOfArgs - args.size()).subst(substExpressions, 0);
}
}
if (result == null) {
return applyDefCall(conCallExpression, args, mode);
}
result = bindExcessiveArgs(args, result, arguments, numberOfArgs, numberOfArgs);
return mode == Mode.TOP ? result : result.accept(this, mode);
}
private Expression visitFunctionCall(Function func, Expression defCallExpr, List<ArgumentExpression> args, Mode mode) {
<<<<<<<
int numberOfSubstArgs = numberOfVariables(func.getArguments());
List<Expression> args2 = completeArgs(args, numberOfArgs, numberOfSubstArgs);
=======
List<Expression> args2 = new ArrayList<>(numberOfArgs);
int numberOfSubstArgs = numberOfVariables(func.getArguments()) + (thisClass != null ? 1 : 0);
for (int i = numberOfArgs - numberOfSubstArgs; i < numberOfArgs - args.size(); ++i) {
args2.add(Index(i));
}
for (int i = args.size() - Math.min(numberOfSubstArgs, args.size()); i < args.size(); ++i) {
args2.add(args.get(i).getExpression().liftIndex(0, numberOfArgs > args.size() ? numberOfArgs - args.size() : 0));
}
>>>>>>>
int numberOfSubstArgs = numberOfVariables(func.getArguments()) + (thisClass != null ? 1 : 0);
List<Expression> args2 = completeArgs(args, numberOfArgs, numberOfSubstArgs);
<<<<<<<
private List<Expression> completeArgs(List<ArgumentExpression> args, int numberOfArgs, int numberOfSubstArgs) {
List<Expression> args2 = new ArrayList<>(numberOfArgs);
for (int i = numberOfArgs - numberOfSubstArgs; i < numberOfArgs - args.size(); ++i) {
args2.add(Index(i));
}
for (int i = args.size() - Math.min(numberOfSubstArgs, args.size()); i < args.size(); ++i) {
args2.add(args.get(i).getExpression().liftIndex(0, numberOfArgs > args.size() ? numberOfArgs - args.size() : 0));
}
return args2;
=======
return mode == Mode.TOP ? result : result.accept(this, mode);
>>>>>>>
private List<Expression> completeArgs(List<ArgumentExpression> args, int numberOfArgs, int numberOfSubstArgs) {
List<Expression> args2 = new ArrayList<>(numberOfArgs);
for (int i = numberOfArgs - numberOfSubstArgs; i < numberOfArgs - args.size(); ++i) {
args2.add(Index(i));
}
for (int i = args.size() - Math.min(numberOfSubstArgs, args.size()); i < args.size(); ++i) {
args2.add(args.get(i).getExpression().liftIndex(0, numberOfArgs > args.size() ? numberOfArgs - args.size() : 0));
}
return args2; |
<<<<<<<
import org.arend.typechecking.provider.ConcreteProvider;
import org.jetbrains.annotations.NotNull;
=======
>>>>>>>
import org.jetbrains.annotations.NotNull;
<<<<<<<
public class ExpressionResolveNameVisitor extends BaseConcreteExpressionVisitor<Void> implements ExpressionResolver {
final TypeClassReferenceExtractVisitor typeClassReferenceExtractVisitor;
=======
public class ExpressionResolveNameVisitor extends BaseConcreteExpressionVisitor<Void> {
private final ReferableConverter myReferableConverter;
>>>>>>>
public class ExpressionResolveNameVisitor extends BaseConcreteExpressionVisitor<Void> implements ExpressionResolver {
private final ReferableConverter myReferableConverter;
<<<<<<<
private ExpressionResolveNameVisitor(TypeClassReferenceExtractVisitor typeClassReferenceExtractVisitor, Scope parentScope, Scope scope, List<Referable> context, ErrorReporter errorReporter, ResolverListener resolverListener) {
this.typeClassReferenceExtractVisitor = typeClassReferenceExtractVisitor;
=======
public ExpressionResolveNameVisitor(ReferableConverter referableConverter, Scope parentScope, List<Referable> context, ErrorReporter errorReporter, ResolverListener resolverListener) {
myReferableConverter = referableConverter;
>>>>>>>
public ExpressionResolveNameVisitor(ReferableConverter referableConverter, Scope parentScope, Scope scope, List<Referable> context, ErrorReporter errorReporter, ResolverListener resolverListener) {
myReferableConverter = referableConverter;
<<<<<<<
if (resolvedReference.resolvedList != null && myResolverListener != null) {
Concrete.Expression argument = elem.expression instanceof Concrete.AppExpression ? ((Concrete.AppExpression) elem.expression).getArguments().get(0).expression : null;
myResolverListener.referenceResolved(argument, resolvedReference.originalReference, resolvedReference.refExpr, resolvedReference.resolvedList);
=======
if (expr.getReferent() instanceof GlobalReferable && !(expr.getReferent() instanceof TCReferable)) {
expr.setReferent(convertReferable(expr.getReferent()));
}
Concrete.Expression arg = argument;
for (; arg instanceof Concrete.AppExpression; arg = ((Concrete.AppExpression) arg).getArguments().get(0).expression) {
Concrete.ReferenceExpression refExpr = (Concrete.ReferenceExpression) ((Concrete.AppExpression) arg).getFunction();
if (refExpr.getReferent() instanceof GlobalReferable && !(refExpr.getReferent() instanceof TCReferable)) {
refExpr.setReferent(convertReferable(refExpr.getReferent()));
}
}
if (arg instanceof Concrete.ReferenceExpression) {
Concrete.ReferenceExpression refExpr = (Concrete.ReferenceExpression) arg;
if (refExpr.getReferent() instanceof GlobalReferable && !(refExpr.getReferent() instanceof TCReferable)) {
refExpr.setReferent(convertReferable(refExpr.getReferent()));
}
}
if (myResolverListener != null) {
myResolverListener.referenceResolved(argument, origRef, expr, resolvedList);
>>>>>>>
if (resolvedReference.resolvedList != null && myResolverListener != null) {
Concrete.Expression argument = elem.expression instanceof Concrete.AppExpression ? ((Concrete.AppExpression) elem.expression).getArguments().get(0).expression : null;
myResolverListener.referenceResolved(argument, resolvedReference.originalReference, resolvedReference.refExpr, resolvedReference.resolvedList); |
<<<<<<<
myErrorReporter.report(new ArgInferenceError(typedDef.getParentNamespace().getResolvedName(), typeOfFunctionArg(index + 1), argument, null, new Expression[0], new LevelExpression[0]));
=======
myErrorReporter.report(new ArgInferenceError(typeOfFunctionArg(index + 1), argument));
>>>>>>>
myErrorReporter.report(new ArgInferenceError(typeOfFunctionArg(index + 1), argument, new Expression[0], new LevelExpression[0]));
<<<<<<<
myErrorReporter.report(new ArgInferenceError(myNamespaceMember.getResolvedName(), typeOfFunctionArg(index + 1), argument, null, new Expression[0], new LevelExpression[0]));
=======
myErrorReporter.report(new ArgInferenceError(typeOfFunctionArg(index + 1), argument));
>>>>>>>
myErrorReporter.report(new ArgInferenceError(typeOfFunctionArg(index + 1), argument, new Expression[0], new LevelExpression[0]));
<<<<<<<
CheckTypeVisitor visitor = new CheckTypeVisitor.Builder(context, myErrorReporter).build();
ClassDefinition thisClass = getThisClass(def, myNamespaceMember.namespace);
Map<String, Binding> polyParams = new HashMap<>();
=======
CheckTypeVisitor visitor = new CheckTypeVisitor.Builder(myState, context, myErrorReporter).build(def);
ClassDefinition thisClass = getThisClass(def);
>>>>>>>
CheckTypeVisitor visitor = new CheckTypeVisitor.Builder(myState, context, myErrorReporter).build(def);
ClassDefinition thisClass = getThisClass(def);
Map<String, Binding> polyParams = new HashMap<>();
<<<<<<<
LevelExpression inferredHLevel = def.getConstructors().size() > 1 ? TypeUniverse.SET.getHLevel() : TypeUniverse.PROP.getHLevel();
LevelExpression inferredPLevel = TypeUniverse.intToPLevel(0);
TypeUniverse inferredUniverse = new TypeUniverse(inferredPLevel, inferredHLevel);
TypeUniverse userUniverse = null;
DataDefinition dataDefinition = new DataDefinition(myNamespaceMember.getResolvedName(), def.getPrecedence(), inferredUniverse, null);
=======
DataDefinition dataDefinition = new DataDefinition(def.getName(), def.getPrecedence(), TypeUniverse.PROP, null);
>>>>>>>
LevelExpression inferredHLevel = def.getConstructors().size() > 1 ? TypeUniverse.SET.getHLevel() : TypeUniverse.PROP.getHLevel();
LevelExpression inferredPLevel = TypeUniverse.intToPLevel(0);
TypeUniverse inferredUniverse = new TypeUniverse(inferredPLevel, inferredHLevel);
TypeUniverse userUniverse = null;
DataDefinition dataDefinition = new DataDefinition(def.getName(), def.getPrecedence(), inferredUniverse, null);
<<<<<<<
if (result == null || result.expression.toUniverse() == null) {
String msg = "Specified type " + def.getUniverse().accept(new PrettyPrintVisitor(new StringBuilder(), new ArrayList<String>(), 0), Abstract.Expression.PREC) + " of '" + def.getName() + "' is not a universe";
myErrorReporter.report(new TypeCheckingError(msg, def.getUniverse()));
} else {
userUniverse = result.expression.toUniverse().getUniverse();
}
=======
if (result == null || result.expression.toUniverse() == null) {
String msg = "Specified type " + def.getUniverse().accept(new PrettyPrintVisitor(new StringBuilder(), 0), Abstract.Expression.PREC) + " of '" + def.getName() + "' is not a universe";
// FIXME[errorformat]
myErrorReporter.report(new TypeCheckingError(def, msg, def.getUniverse()));
} else {
userUniverse = result.expression.toUniverse().getUniverse();
>>>>>>>
if (result == null || result.expression.toUniverse() == null) {
String msg = "Specified type " + def.getUniverse().accept(new PrettyPrintVisitor(new StringBuilder(), 0), Abstract.Expression.PREC) + " of '" + def.getName() + "' is not a universe";
// FIXME[errorformat]
myErrorReporter.report(new TypeCheckingError(def, msg, def.getUniverse()));
} else {
userUniverse = result.expression.toUniverse().getUniverse();
} |
<<<<<<<
assertEquals(Pi(typeArgs(Tele(vars("A"), Universe(0)), Tele(vars("x"), Index(0))), Index(1)), def.getType());
assertEquals(Pi(typeArgs(Tele(vars("A"), Universe(0)), Tele(vars("x"), Index(0))), Index(1)), ((FunctionDefinition) def).getTerm().getType(new ArrayList<Binding>(1)));
=======
assertEquals(Pi(args(Tele(vars("A"), Universe(0)), Tele(vars("x"), Index(0))), Index(1)), def.getType());
assertEquals(Pi(args(Tele(vars("A"), Universe(0)), Tele(vars("x"), Index(0))), Index(1)), ((LeafElimTreeNode) ((FunctionDefinition) def).getElimTree()).getExpression().getType(new ArrayList<Binding>(1)));
>>>>>>>
assertEquals(Pi(typeArgs(Tele(vars("A"), Universe(0)), Tele(vars("x"), Index(0))), Index(1)), def.getType());
assertEquals(Pi(typeArgs(Tele(vars("A"), Universe(0)), Tele(vars("x"), Index(0))), Index(1)), ((LeafElimTreeNode) ((FunctionDefinition) def).getElimTree()).getExpression().getType(new ArrayList<Binding>(1)));
<<<<<<<
assertEquals(Pi(typeArgs(Tele(vars("p"), context.get(0).getType())), Pi(type, type)), namespace.getDefinition("test").getType());
assertEquals(Pi(type, type), ((FunctionDefinition) namespace.getDefinition("test")).getTerm().getType(context));
=======
assertEquals(Pi(args(Tele(vars("p"), context.get(0).getType())), Pi(type, type)), namespace.getDefinition("test").getType());
assertEquals(Pi(type, type), ((LeafElimTreeNode) ((FunctionDefinition) namespace.getDefinition("test")).getElimTree()).getExpression().getType(context));
>>>>>>>
assertEquals(Pi(typeArgs(Tele(vars("p"), context.get(0).getType())), Pi(type, type)), namespace.getDefinition("test").getType());
assertEquals(Pi(type, type), ((LeafElimTreeNode) ((FunctionDefinition) namespace.getDefinition("test")).getElimTree()).getExpression().getType(context));
<<<<<<<
assertEquals(Sigma(typeArgs(Tele(vars("x", "y"), Nat()), TypeArg(Apps(FunCall(Prelude.PATH_INFIX), Nat(), Index(1), Index(0))))), ((FunctionDefinition) def).getTerm().getType(new ArrayList<Binding>(0)));
=======
assertEquals(Sigma(args(Tele(vars("x", "y"), Nat()), TypeArg(Apps(FunCall(Prelude.PATH_INFIX), Nat(), Index(1), Index(0))))), ((LeafElimTreeNode)((FunctionDefinition) def).getElimTree()).getExpression().getType(new ArrayList<Binding>(0)));
>>>>>>>
assertEquals(Sigma(typeArgs(Tele(vars("x", "y"), Nat()), TypeArg(Apps(FunCall(Prelude.PATH_INFIX), Nat(), Index(1), Index(0))))), ((LeafElimTreeNode)((FunctionDefinition) def).getElimTree()).getExpression().getType(new ArrayList<Binding>(0)));
<<<<<<<
assertEquals(Pi(typeArgs(Tele(vars("F"), Pi(Nat(), Universe())), Tele(vars("f"), Pi(typeArgs(Tele(vars("x"), Nat())), Apps(Index(1), Index(0))))), Apps(Index(1), Zero())),
((FunctionDefinition) def).getTerm().getType(new ArrayList<Binding>()));
=======
assertEquals(Pi(args(Tele(vars("F"), Pi(Nat(), Universe())), Tele(vars("f"), Pi(args(Tele(vars("x"), Nat())), Apps(Index(1), Index(0))))), Apps(Index(1), Zero())),
((LeafElimTreeNode) ((FunctionDefinition) def).getElimTree()).getExpression().getType(new ArrayList<Binding>()));
>>>>>>>
assertEquals(Pi(typeArgs(Tele(vars("F"), Pi(Nat(), Universe())), Tele(vars("f"), Pi(typeArgs(Tele(vars("x"), Nat())), Apps(Index(1), Index(0))))), Apps(Index(1), Zero())),
((LeafElimTreeNode) ((FunctionDefinition) def).getElimTree()).getExpression().getType(new ArrayList<Binding>())); |
<<<<<<<
import com.jetbrains.jetpad.vclang.typechecking.error.TypeMismatchError;
import com.jetbrains.jetpad.vclang.error.ErrorReporter;
=======
import com.jetbrains.jetpad.vclang.typechecking.error.reporter.ErrorReporter;
>>>>>>>
<<<<<<<
CheckTypeVisitor visitor = new CheckTypeVisitor.Builder(myState, context, myErrorReporter).thisClass(thisClass, Reference(thisParameter)).build();
Universe universe = new Universe.Type(0, Universe.Type.PROP);
=======
CheckTypeVisitor visitor = new CheckTypeVisitor.Builder(context, myErrorReporter).thisClass(thisClass, Reference(thisParameter)).build();
LevelExpression plevel = null;
ClassField typedDef = new ClassField(myNamespaceMember.getResolvedName(), def.getPrecedence(), null, thisClass, thisParameter);
>>>>>>>
CheckTypeVisitor visitor = new CheckTypeVisitor.Builder(myState, context, myErrorReporter).thisClass(thisClass, Reference(thisParameter)).build();
LevelExpression plevel = null;
ClassField typedDef = new ClassField(def.getName(), def.getPrecedence(), null, thisClass, thisParameter);
<<<<<<<
Universe argUniverse = ((UniverseExpression) result.type).getUniverse();
Universe maxUniverse = universe.max(argUniverse);
if (maxUniverse == null) {
String error = "Universe " + argUniverse + " of " + ordinal(index) + " argument is not compatible with universe " + universe + " of previous arguments";
myErrorReporter.report(new TypeCheckingError(error, def));
return null;
=======
LevelExpression argPLevel = result.type.toUniverse().getUniverse().getPLevel();
if (plevel == null) {
plevel = argPLevel;
>>>>>>>
LevelExpression argPLevel = result.type.toUniverse().getUniverse().getPLevel();
if (plevel == null) {
plevel = argPLevel;
<<<<<<<
myErrorReporter.report(new ArgInferenceError(typeOfFunctionArg(index + 1), argument, null));
return null;
=======
myErrorReporter.report(new ArgInferenceError(myNamespaceMember.getResolvedName(), typeOfFunctionArg(index + 1), argument, null));
return typedDef;
>>>>>>>
myErrorReporter.report(new ArgInferenceError(typeOfFunctionArg(index + 1), argument, null));
return typedDef;
<<<<<<<
Universe resultTypeUniverse = ((UniverseExpression) typeResult.type).getUniverse();
Universe maxUniverse = universe.max(resultTypeUniverse);
if (maxUniverse == null) {
String error = "Universe " + resultTypeUniverse + " of the result type is not compatible with universe " + universe + " of arguments";
myErrorReporter.report(new TypeCheckingError(error, def));
return null;
=======
TypeUniverse resultTypeUniverse = typeResult.type.toUniverse().getUniverse();
if (plevel == null) {
plevel = resultTypeUniverse.getPLevel();
>>>>>>>
TypeUniverse resultTypeUniverse = typeResult.type.toUniverse().getUniverse();
if (plevel == null) {
plevel = resultTypeUniverse.getPLevel();
<<<<<<<
ClassField typedDef = new ClassField(def.getName(), def.getPrecedence(), list.isEmpty() ? typedResultType : Pi(list.getFirst(), typedResultType), thisClass, thisParameter);
typedDef.setUniverse(universe);
=======
typedDef.hasErrors(false);
typedDef.setBaseType(list.isEmpty() ? typedResultType : Pi(list.getFirst(), typedResultType));
typedDef.setUniverse(new TypeUniverse(plevel, resultTypeUniverse.getHLevel()));
>>>>>>>
typedDef.hasErrors(false);
typedDef.setBaseType(list.isEmpty() ? typedResultType : Pi(list.getFirst(), typedResultType));
typedDef.setUniverse(new TypeUniverse(plevel, resultTypeUniverse.getHLevel()));
<<<<<<<
DataDefinition dataDefinition = new DataDefinition(def.getName(), def.getPrecedence(), universe != null ? universe : new Universe.Type(0, Universe.Type.PROP), null);
=======
DataDefinition dataDefinition = new DataDefinition(myNamespaceMember.getResolvedName(), def.getPrecedence(), TypeUniverse.PROP, null);
>>>>>>>
DataDefinition dataDefinition = new DataDefinition(def.getName(), def.getPrecedence(), TypeUniverse.PROP, null);
<<<<<<<
Constructor constructor = new Constructor(def.getName(), def.getPrecedence(), universe, null, dataDefinition, null);
=======
Constructor constructor = new Constructor(new DefinitionResolvedName(dataDefinition.getParentNamespace().getChild(dataDefinition.getName()), name), def.getPrecedence(), TypeUniverse.PROP, null, dataDefinition, null);
>>>>>>>
Constructor constructor = new Constructor(name, def.getPrecedence(), TypeUniverse.PROP, null, dataDefinition, null);
<<<<<<<
Universe argUniverse = ((UniverseExpression) result.type).getUniverse();
Universe maxUniverse = universe.max(argUniverse);
if (maxUniverse == null) {
String error = "Universe " + argUniverse + " of " + ordinal(index) + " argument is not compatible with universe " + universe + " of previous arguments";
myErrorReporter.report(new TypeCheckingError(error, def));
ok = false;
=======
TypeUniverse argUniverse = result.type.toUniverse().getUniverse();
if (plevel == null) {
plevel = argUniverse.getPLevel();
hlevel = argUniverse.getHLevel();
>>>>>>>
TypeUniverse argUniverse = result.type.toUniverse().getUniverse();
if (plevel == null) {
plevel = argUniverse.getPLevel();
hlevel = argUniverse.getHLevel(); |
<<<<<<<
@Test
public void dependentElim() {
typeCheckClass(
"\\data Bool | true | false\n" +
"\\function if (b : Bool) : \\Set <= \\elim b | true => Nat | false => Nat -> Nat\n" +
"\\function test (b : Bool) (x : if b) : Nat <= \\elim b, x | true, zero => 0 | true, suc n => n | false, _ => 0"
);
}
@Test
public void numberElim() {
typeCheckClass("\\function f (n : Nat) : Nat <= \\elim n | 2 => 0 | 0 => 1 | 1 => 2 | suc (suc (suc n)) => n");
}
@Test
public void numberElim2() {
typeCheckClass("\\function f (n : Nat) : Nat <= \\elim n | 0 => 1 | 1 => 2 | suc (suc (suc n)) => n", 1);
}
=======
@Test
public void threeVars() {
typeCheckClass(
"\\function f (x y z : Nat) : Nat <= \\elim x, y, z\n" +
" | zero, zero, zero => zero\n" +
" | zero, zero, suc k => k\n" +
" | zero, suc m, zero => m\n" +
" | zero, suc m, suc k => k\n" +
" | suc n, zero, zero => n\n" +
" | suc n, zero, suc k => k\n" +
" | suc n, suc m, zero => m\n" +
" | suc n, suc m, suc k => n");
}
>>>>>>>
@Test
public void threeVars() {
typeCheckClass(
"\\function f (x y z : Nat) : Nat <= \\elim x, y, z\n" +
" | zero, zero, zero => zero\n" +
" | zero, zero, suc k => k\n" +
" | zero, suc m, zero => m\n" +
" | zero, suc m, suc k => k\n" +
" | suc n, zero, zero => n\n" +
" | suc n, zero, suc k => k\n" +
" | suc n, suc m, zero => m\n" +
" | suc n, suc m, suc k => n");
}
@Test
public void dependentElim() {
typeCheckClass(
"\\data Bool | true | false\n" +
"\\function if (b : Bool) : \\Set <= \\elim b | true => Nat | false => Nat -> Nat\n" +
"\\function test (b : Bool) (x : if b) : Nat <= \\elim b, x | true, zero => 0 | true, suc n => n | false, _ => 0"
);
}
@Test
public void numberElim() {
typeCheckClass("\\function f (n : Nat) : Nat <= \\elim n | 2 => 0 | 0 => 1 | 1 => 2 | suc (suc (suc n)) => n");
}
@Test
public void numberElim2() {
typeCheckClass("\\function f (n : Nat) : Nat <= \\elim n | 0 => 1 | 1 => 2 | suc (suc (suc n)) => n", 1);
} |
<<<<<<<
import java.util.ArrayList;
=======
import java.util.Collections;
>>>>>>>
import java.util.ArrayList;
import java.util.Collections; |
<<<<<<<
import org.junit.Before;
=======
import com.jetbrains.jetpad.vclang.term.definition.Definition;
>>>>>>>
import org.junit.Before;
import com.jetbrains.jetpad.vclang.term.definition.Definition; |
<<<<<<<
if (argument instanceof Abstract.TelescopeArgument) {
List<? extends Abstract.ReferableSourceNode> referableList = ((Abstract.TelescopeArgument) argument).getReferableList();
List<String> names = new ArrayList<>(referableList.size());
for (Abstract.ReferableSourceNode referable : referableList) {
names.add(referable == null ? null : referable.getName());
}
param = parameter(argument.getExplicit(), names, paramResult);
=======
if (parameter instanceof Abstract.TelescopeParameter) {
List<? extends Abstract.ReferableSourceNode> referableList = ((Abstract.TelescopeParameter) parameter).getReferableList();
List<String> names = referableList.stream().map(r -> r == null ? null : r.getName()).collect(Collectors.toList());
param = parameter(parameter.getExplicit(), names, paramResult);
>>>>>>>
if (parameter instanceof Abstract.TelescopeParameter) {
List<? extends Abstract.ReferableSourceNode> referableList = ((Abstract.TelescopeParameter) parameter).getReferableList();
List<String> names = new ArrayList<>(referableList.size());
for (Abstract.ReferableSourceNode referable : referableList) {
names.add(referable == null ? null : referable.getName());
}
param = parameter(parameter.getExplicit(), names, paramResult); |
<<<<<<<
ClassField typedDef = new ClassField(def.getName(), def.getPrecedence(), null, thisClass, thisParameter);
=======
ClassField typedDef = new ClassField(myNamespaceMember.getResolvedName(), def.getPrecedence(), Error(null, null), thisClass, thisParameter);
>>>>>>>
ClassField typedDef = new ClassField(def.getName(), def.getPrecedence(), Error(null, null), thisClass, thisParameter);
<<<<<<<
ClassDefinition typedDef = new ClassDefinition(def.getName(), SimpleStaticNamespaceProvider.INSTANCE.forDefinition(def), SimpleDynamicNamespaceProvider.INSTANCE.forClass(def));
ClassDefinition thisClass = getThisClass(def);
=======
ClassDefinition typedDef = new ClassDefinition(myNamespaceMember.getResolvedName());
int index = 0;
for (Referable referable : def.getSuperClasses()) {
if (referable == null) {
myErrorReporter.report(new TypeCheckingError("Could not find class '" + def.getSuperClassName(index) + "'", def));
continue;
}
ClassDefinition superClass = null;
if (referable instanceof ClassDefinition) {
superClass = (ClassDefinition) referable;
} else
if (referable instanceof Abstract.ClassDefinition) {
NamespaceMember member = NamespaceMember.toNamespaceMember(referable);
if (member != null && member.definition instanceof ClassDefinition) {
superClass = (ClassDefinition) member.definition;
}
}
if (superClass != null) {
boolean ok = true;
for (ClassField field : superClass.getFields()) {
ClassField oldField = typedDef.tryAddField(field);
if (oldField != null) {
myErrorReporter.report(new NameDefinedError(true, referable, oldField.getName(), null));
ok = false;
}
}
if (ok) {
typedDef.addSuperClass(superClass);
}
} else {
myErrorReporter.report(new TypeCheckingError("Expected a class", referable));
}
index++;
}
ClassDefinition thisClass = getThisClass(def, myNamespaceMember.namespace);
>>>>>>>
ClassDefinition typedDef = new ClassDefinition(def.getName(), SimpleStaticNamespaceProvider.INSTANCE.forDefinition(def), SimpleDynamicNamespaceProvider.INSTANCE.forClass(def));
int index = 0;
for (Referable referable : def.getSuperClasses()) {
if (referable == null) {
myErrorReporter.report(new TypeCheckingError("Could not find class '" + def.getSuperClassName(index) + "'", def));
continue;
}
ClassDefinition superClass = null;
if (referable instanceof ClassDefinition) {
superClass = (ClassDefinition) referable;
} else {
Definition typecheckedSuper = myState.getTypechecked(referable);
if (typecheckedSuper instanceof ClassDefinition) {
superClass = (ClassDefinition) typecheckedSuper;
}
}
if (superClass != null) {
boolean ok = true;
for (ClassField field : superClass.getFields()) {
ClassField oldField = typedDef.tryAddField(field);
if (oldField != null) {
myErrorReporter.report(new TypeCheckingError("Duplicate field", null)); // FIXME[error] report proper
ok = false;
}
}
if (ok) {
typedDef.addSuperClass(superClass);
}
} else {
myErrorReporter.report(new TypeCheckingError("Expected a class", referable));
}
index++;
}
ClassDefinition thisClass = getThisClass(def); |
<<<<<<<
DefinitionBuilder.Data path = new DefinitionBuilder.Data(PRELUDE, "Path", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(new Sort(PathLp, PathLh)), PathParameter1, Arrays.asList(PathLp.getVar(), PathLh.getVar()));
=======
Preprelude.DefinitionBuilder.Data path = new Preprelude.DefinitionBuilder.Data(PRELUDE, "Path", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(new Sort(PathLp, PathLh)), PathParameter1, Arrays.asList((Binding) PathLp.getVar(), (Binding) PathLh.getVar()));
>>>>>>>
DefinitionBuilder.Data path = new DefinitionBuilder.Data(PRELUDE, "Path", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(new Sort(PathLp, PathLh)), PathParameter1, Arrays.asList((Binding) PathLp.getVar(), (Binding) PathLh.getVar()));
<<<<<<<
PATH_INFIX = new DefinitionBuilder.Function(PRELUDE, "=", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.NON_ASSOC, (byte) 0), pathInfixParameter1, Universe(pathInfixLp, pathInfixLh), top(pathInfixParameter1, leaf(pathInfixTerm)), Arrays.asList(pathInfixLp.getVar(), pathInfixLh.getVar())).definition();
=======
PATH_INFIX = new Preprelude.DefinitionBuilder.Function(PRELUDE, "=", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.NON_ASSOC, (byte) 0), pathInfixParameter1, Universe(pathInfixLp, pathInfixLh), top(pathInfixParameter1, leaf(pathInfixTerm)), Arrays.asList((Binding) pathInfixLp.getVar(), (Binding) pathInfixLh.getVar())).definition();
>>>>>>>
PATH_INFIX = new DefinitionBuilder.Function(PRELUDE, "=", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.NON_ASSOC, (byte) 0), pathInfixParameter1, Universe(pathInfixLp, pathInfixLh), top(pathInfixParameter1, leaf(pathInfixTerm)), Arrays.asList((Binding) pathInfixLp.getVar(), (Binding) pathInfixLh.getVar())).definition();
<<<<<<<
AT = new DefinitionBuilder.Function(PRELUDE, "@", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.LEFT_ASSOC, (byte) 9), atParameter1, atResultType, atElimTree, Arrays.asList(atLp.getVar(), atLh.getVar())).definition();
=======
AT = new Preprelude.DefinitionBuilder.Function(PRELUDE, "@", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.LEFT_ASSOC, (byte) 9), atParameter1, atResultType, atElimTree, Arrays.asList((Binding) atLp.getVar(), (Binding) atLh.getVar())).definition();
>>>>>>>
AT = new DefinitionBuilder.Function(PRELUDE, "@", new Abstract.Binding.Precedence(Abstract.Binding.Associativity.LEFT_ASSOC, (byte) 9), atParameter1, atResultType, atElimTree, Arrays.asList((Binding) atLp.getVar(), (Binding) atLh.getVar())).definition();
<<<<<<<
clause(LEFT, EmptyDependentLink.getInstance(), Abstract.Definition.Arrow.RIGHT, Reference(coerceParameter2))));
COERCE = new DefinitionBuilder.Function(PRELUDE, "coe", Abstract.Binding.DEFAULT_PRECEDENCE, coerceParameter1, Apps(Reference(coerceParameter1), Reference(coerceParameter3)), coerceElimTreeNode, Arrays.asList(coerceLp.getVar(), coerceLh.getVar())).definition();
=======
clause(Preprelude.LEFT, EmptyDependentLink.getInstance(), Abstract.Definition.Arrow.RIGHT, Reference(coerceParameter2))));
COERCE = new Preprelude.DefinitionBuilder.Function(PRELUDE, "coe", Abstract.Binding.DEFAULT_PRECEDENCE, coerceParameter1, Apps(Reference(coerceParameter1), Reference(coerceParameter3)), coerceElimTreeNode, Arrays.asList((Binding) coerceLp.getVar(), (Binding) coerceLh.getVar())).definition();
>>>>>>>
clause(LEFT, EmptyDependentLink.getInstance(), Abstract.Definition.Arrow.RIGHT, Reference(coerceParameter2))));
COERCE = new DefinitionBuilder.Function(PRELUDE, "coe", Abstract.Binding.DEFAULT_PRECEDENCE, coerceParameter1, Apps(Reference(coerceParameter1), Reference(coerceParameter3)), coerceElimTreeNode, Arrays.asList((Binding) coerceLp.getVar(), (Binding) coerceLh.getVar())).definition();
<<<<<<<
ISO = new DefinitionBuilder.Function(PRELUDE, "iso", Abstract.Binding.DEFAULT_PRECEDENCE, isoParameter1, isoResultType, isoElimTree, Arrays.asList(isoLp.getVar(), isoLh.getVar())).definition();
=======
ISO = new Preprelude.DefinitionBuilder.Function(PRELUDE, "iso", Abstract.Binding.DEFAULT_PRECEDENCE, isoParameter1, isoResultType, isoElimTree, Arrays.asList((Binding) isoLp.getVar(), (Binding) isoLh.getVar())).definition();
>>>>>>>
ISO = new DefinitionBuilder.Function(PRELUDE, "iso", Abstract.Binding.DEFAULT_PRECEDENCE, isoParameter1, isoResultType, isoElimTree, Arrays.asList((Binding) isoLp.getVar(), (Binding) isoLh.getVar())).definition();
<<<<<<<
DefinitionBuilder.Data propTrunc = new DefinitionBuilder.Data(PRELUDE, "TrP", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(Sort.PROP), truncPParameter, Arrays.asList(truncPLp.getVar(), truncPLh.getVar()));
=======
Preprelude.DefinitionBuilder.Data propTrunc = new Preprelude.DefinitionBuilder.Data(PRELUDE, "TrP", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(Sort.PROP), truncPParameter, Arrays.asList((Binding) truncPLp.getVar(), (Binding) truncPLh.getVar()));
>>>>>>>
DefinitionBuilder.Data propTrunc = new DefinitionBuilder.Data(PRELUDE, "TrP", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(Sort.PROP), truncPParameter, Arrays.asList((Binding) truncPLp.getVar(), (Binding) truncPLh.getVar()));
<<<<<<<
DefinitionBuilder.Data setTrunc = new DefinitionBuilder.Data(PRELUDE, "TrS", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(Sort.SetOfLevel(truncSLp)), truncSParameter, Arrays.asList(truncSLp.getVar(), truncSLh.getVar()));
=======
Preprelude.DefinitionBuilder.Data setTrunc = new Preprelude.DefinitionBuilder.Data(PRELUDE, "TrS", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(Sort.SetOfLevel(truncSLp)), truncSParameter, Arrays.asList((Binding) truncSLp.getVar(), (Binding) truncSLh.getVar()));
>>>>>>>
DefinitionBuilder.Data setTrunc = new DefinitionBuilder.Data(PRELUDE, "TrS", Abstract.Binding.DEFAULT_PRECEDENCE, new SortMax(Sort.SetOfLevel(truncSLp)), truncSParameter, Arrays.asList((Binding) truncSLp.getVar(), (Binding) truncSLh.getVar())); |
<<<<<<<
public DataDefinition(String name, Abstract.Definition.Precedence precedence, Universe universe, DependentLink parameters) {
super(name, precedence);
setUniverse(universe);
=======
public DataDefinition(ResolvedName rn, Abstract.Definition.Precedence precedence, TypeUniverse universe, DependentLink parameters) {
super(rn, precedence, universe);
>>>>>>>
public DataDefinition(String name, Abstract.Definition.Precedence precedence, TypeUniverse universe, DependentLink parameters) {
super(name, precedence, universe); |
<<<<<<<
private final NamespaceProviders myNsProviders;
private List<Abstract.ReferableSourceNode> myContext;
=======
private List<String> myContext;
>>>>>>>
private List<Abstract.ReferableSourceNode> myContext;
<<<<<<<
private DefinitionResolveNameVisitor(NamespaceProviders nsProviders, List<Abstract.ReferableSourceNode> context,
NameResolver nameResolver, ResolveListener resolveListener) {
myNsProviders = nsProviders;
=======
private DefinitionResolveNameVisitor(List<String> context,
NameResolver nameResolver, ResolveListener resolveListener) {
>>>>>>>
private DefinitionResolveNameVisitor(List<Abstract.ReferableSourceNode> context,
NameResolver nameResolver, ResolveListener resolveListener) {
<<<<<<<
Abstract.FunctionBody body = def.getBody();
ExpressionResolveNameVisitor exprVisitor = new ExpressionResolveNameVisitor(myNsProviders, scope, myContext, myNameResolver, myResolveListener);
=======
ExpressionResolveNameVisitor exprVisitor = new ExpressionResolveNameVisitor(scope, myContext, myNameResolver, myResolveListener);
>>>>>>>
Abstract.FunctionBody body = def.getBody();
ExpressionResolveNameVisitor exprVisitor = new ExpressionResolveNameVisitor(scope, myContext, myNameResolver, myResolveListener);
<<<<<<<
Scope scope = new DataScope(parentScope, new NamespaceScope(myNsProviders.statics.forDefinition(def)));
ExpressionResolveNameVisitor exprVisitor = new ExpressionResolveNameVisitor(myNsProviders, scope, myContext, myNameResolver, myResolveListener);
try (Utils.CompleteContextSaver<Abstract.ReferableSourceNode> saver = new Utils.CompleteContextSaver<>(myContext)) {
exprVisitor.visitArguments(def.getParameters());
if (def.getUniverse() != null) {
def.getUniverse().accept(exprVisitor, null);
=======
ExpressionResolveNameVisitor exprVisitor = new ExpressionResolveNameVisitor(parentScope, myContext, myNameResolver, myResolveListener);
try (Utils.CompleteContextSaver<String> saver = new Utils.CompleteContextSaver<>(myContext)) {
for (Abstract.TypeArgument parameter : def.getParameters()) {
parameter.getType().accept(exprVisitor, null);
if (parameter instanceof Abstract.TelescopeArgument) {
myContext.addAll(((Abstract.TelescopeArgument) parameter).getNames());
}
>>>>>>>
Scope scope = new DataScope(parentScope, new NamespaceScope(myNameResolver.nsProviders.statics.forDefinition(def)));
ExpressionResolveNameVisitor exprVisitor = new ExpressionResolveNameVisitor(scope, myContext, myNameResolver, myResolveListener);
try (Utils.CompleteContextSaver<Abstract.ReferableSourceNode> saver = new Utils.CompleteContextSaver<>(myContext)) {
exprVisitor.visitArguments(def.getParameters());
if (def.getUniverse() != null) {
def.getUniverse().accept(exprVisitor, null);
<<<<<<<
if (def.getEliminatedReferences() != null) {
try (Utils.ContextSaver ignored = new Utils.ContextSaver(myContext)) {
addNotEliminatedArguments(def.getParameters(), def.getEliminatedReferences());
for (Abstract.ConstructorClause clause : def.getConstructorClauses()) {
=======
if (def.getConditions() != null) {
Scope scope = new DataScope(parentScope, new NamespaceScope(myNameResolver.nsProviders.statics.forDefinition(def)));
exprVisitor = new ExpressionResolveNameVisitor(scope, myContext, myNameResolver, myResolveListener);
for (Abstract.Condition cond : def.getConditions()) {
>>>>>>>
if (def.getEliminatedReferences() != null) {
try (Utils.ContextSaver ignored = new Utils.ContextSaver(myContext)) {
addNotEliminatedArguments(def.getParameters(), def.getEliminatedReferences());
for (Abstract.ConstructorClause clause : def.getConstructorClauses()) {
<<<<<<<
def.getUnderlyingClassReference().accept(new ExpressionResolveNameVisitor(myNsProviders, parentScope, myContext, myNameResolver, myResolveListener), null);
Abstract.ReferableSourceNode resolvedUnderlyingClass = def.getUnderlyingClassReference().getReferent();
=======
def.getUnderlyingClassDefCall().accept(new ExpressionResolveNameVisitor(parentScope, myContext, myNameResolver, myResolveListener), null);
Abstract.Definition resolvedUnderlyingClass = def.getUnderlyingClassDefCall().getReferent();
>>>>>>>
def.getUnderlyingClassReference().accept(new ExpressionResolveNameVisitor(parentScope, myContext, myNameResolver, myResolveListener), null);
Abstract.ReferableSourceNode resolvedUnderlyingClass = def.getUnderlyingClassReference().getReferent(); |
<<<<<<<
private final Expression myType;
=======
private ClassDefinition myThisClass;
private Expression myBaseType;
>>>>>>>
private Expression myType;
<<<<<<<
myType = type;
setThisClass(thisClass);
=======
myBaseType = type;
myThisClass = thisClass;
>>>>>>>
myType = type;
setThisClass(thisClass);
<<<<<<<
=======
public Expression getType() {
return Pi("\\this", ClassCall(myThisClass), myBaseType);
}
>>>>>>> |
<<<<<<<
FunctionDefinition def = (FunctionDefinition) parseDef("\\function test (n : Nat) : Nat => \\case n, n | zero, _ => 0 | suc y, _ => y");
FunctionDefinition def2 = (FunctionDefinition) parseDef("\\function test (n : Nat) => \\let | caseF (caseA : Nat) (caseB : Nat) : Nat <= \\elim caseA, caseB | zero, _ => 0 | suc y, _ => y \\in caseF n n");
=======
FunctionDefinition def = (FunctionDefinition) typeCheckDef("\\function test : Nat => \\case 1 | zero => 0 | suc y => y");
FunctionDefinition def2 = (FunctionDefinition) typeCheckDef("\\function test => \\let | caseF (caseA : Nat) : Nat <= \\elim caseA | zero => 0 | suc y => y \\in caseF 1");
>>>>>>>
FunctionDefinition def = (FunctionDefinition) typeCheckDef("\\function test (n : Nat) : Nat => \\case n, n | zero, _ => 0 | suc y, _ => y");
FunctionDefinition def2 = (FunctionDefinition) typeCheckDef("\\function test (n : Nat) => \\let | caseF (caseA : Nat) (caseB : Nat) : Nat <= \\elim caseA, caseB | zero, _ => 0 | suc y, _ => y \\in caseF n n"); |
<<<<<<<
ElimExpression plusTerm = Elim(Index(1), plusClauses);
plus = new FunctionDefinition(new Utils.Name("+", Abstract.Definition.Fixity.INFIX), null, new Abstract.Definition.Precedence(Abstract.Definition.Associativity.LEFT_ASSOC, (byte) 6), lamArgs(Tele(vars("x", "y"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, plusTerm);
plusClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Index(0), plusTerm));
plusClauses.add(new Clause(match(Prelude.SUC, match("x")), Abstract.Definition.Arrow.RIGHT, Suc(BinOp(Index(0), plus, Index(1))), plusTerm));
=======
ElimExpression plusTerm = Elim(Index(1), plusClauses, null);
plus = new FunctionDefinition(new Namespace(new Utils.Name("+", Abstract.Definition.Fixity.INFIX), null), new Abstract.Definition.Precedence(Abstract.Definition.Associativity.LEFT_ASSOC, (byte) 6), lamArgs(Tele(vars("x", "y"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, plusTerm);
plusClauses.add(new Clause(Prelude.ZERO, new ArrayList<NameArgument>(), Abstract.Definition.Arrow.RIGHT, Index(0), plusTerm));
plusClauses.add(new Clause(Prelude.SUC, nameArgs(Name("x'")), Abstract.Definition.Arrow.RIGHT, Suc(BinOp(Index(0), plus, Index(1))), plusTerm));
>>>>>>>
ElimExpression plusTerm = Elim(Index(1), plusClauses);
plus = new FunctionDefinition(new Namespace(new Utils.Name("+", Abstract.Definition.Fixity.INFIX), null), new Abstract.Definition.Precedence(Abstract.Definition.Associativity.LEFT_ASSOC, (byte) 6), lamArgs(Tele(vars("x", "y"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, plusTerm);
plusClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Index(0), plusTerm));
plusClauses.add(new Clause(match(Prelude.SUC, match("x")), Abstract.Definition.Arrow.RIGHT, Suc(BinOp(Index(0), plus, Index(1))), plusTerm));
<<<<<<<
ElimExpression mulTerm = Elim(Index(1), mulClauses);
mul = new FunctionDefinition(new Utils.Name("*", Abstract.Definition.Fixity.INFIX), null, new Abstract.Definition.Precedence(Abstract.Definition.Associativity.LEFT_ASSOC, (byte) 7), lamArgs(Tele(vars("x", "y"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, mulTerm);
mulClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Zero(), mulTerm));
mulClauses.add(new Clause(match(Prelude.SUC, match("x")), Abstract.Definition.Arrow.RIGHT, BinOp(Index(0), plus, BinOp(Index(1), mul, Index(0))), mulTerm));
=======
ElimExpression mulTerm = Elim(Index(1), mulClauses, null);
mul = new FunctionDefinition(new Namespace(new Utils.Name("*", Abstract.Definition.Fixity.INFIX), null), new Abstract.Definition.Precedence(Abstract.Definition.Associativity.LEFT_ASSOC, (byte) 7), lamArgs(Tele(vars("x", "y"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, mulTerm);
mulClauses.add(new Clause(Prelude.ZERO, new ArrayList<NameArgument>(), Abstract.Definition.Arrow.RIGHT, Zero(), mulTerm));
mulClauses.add(new Clause(Prelude.SUC, nameArgs(Name("x'")), Abstract.Definition.Arrow.RIGHT, BinOp(Index(0), plus, BinOp(Index(1), mul, Index(0))), mulTerm));
>>>>>>>
ElimExpression mulTerm = Elim(Index(1), mulClauses);
mul = new FunctionDefinition(new Namespace(new Utils.Name("*", Abstract.Definition.Fixity.INFIX), null), new Abstract.Definition.Precedence(Abstract.Definition.Associativity.LEFT_ASSOC, (byte) 7), lamArgs(Tele(vars("x", "y"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, mulTerm);
mulClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Zero(), mulTerm));
mulClauses.add(new Clause(match(Prelude.SUC, match("x")), Abstract.Definition.Arrow.RIGHT, BinOp(Index(0), plus, BinOp(Index(1), mul, Index(0))), mulTerm));
<<<<<<<
ElimExpression facTerm = Elim(Index(0), facClauses);
fac = new FunctionDefinition(new Utils.Name("fac"), null, Abstract.Definition.DEFAULT_PRECEDENCE, lamArgs(Tele(vars("x"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, facTerm);
facClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Suc(Zero()), facTerm)); facClauses.add(new Clause(match(Prelude.SUC, match("x'")), Abstract.Definition.Arrow.RIGHT, BinOp(Suc(Index(0)), mul, Apps(DefCall(fac), Index(0))), facTerm));
=======
ElimExpression facTerm = Elim(Index(0), facClauses, null);
fac = new FunctionDefinition(new Namespace(new Utils.Name("fac"), null), Abstract.Definition.DEFAULT_PRECEDENCE, lamArgs(Tele(vars("x"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, facTerm);
facClauses.add(new Clause(Prelude.ZERO, new ArrayList<NameArgument>(), Abstract.Definition.Arrow.RIGHT, Suc(Zero()), facTerm));
facClauses.add(new Clause(Prelude.SUC, nameArgs(Name("x'")), Abstract.Definition.Arrow.RIGHT, BinOp(Suc(Index(0)), mul, Apps(DefCall(fac), Index(0))), facTerm));
>>>>>>>
ElimExpression facTerm = Elim(Index(0), facClauses);
fac = new FunctionDefinition(new Namespace(new Utils.Name("fac"), null), Abstract.Definition.DEFAULT_PRECEDENCE, lamArgs(Tele(vars("x"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, facTerm);
facClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Suc(Zero()), facTerm)); facClauses.add(new Clause(match(Prelude.SUC, match("x'")), Abstract.Definition.Arrow.RIGHT, BinOp(Suc(Index(0)), mul, Apps(DefCall(fac), Index(0))), facTerm));
<<<<<<<
ElimExpression nelimTerm = Elim(Index(0), nelimClauses);
nelim = new FunctionDefinition(new Utils.Name("nelim"), null, Abstract.Definition.DEFAULT_PRECEDENCE, lamArgs(Tele(vars("z"), Nat()), Tele(vars("s"), Pi(Nat(), Pi(Nat(), Nat()))), Tele(vars("x"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, nelimTerm);
nelimClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Index(1), nelimTerm));
nelimClauses.add(new Clause(match(Prelude.SUC, match("x")), Abstract.Definition.Arrow.RIGHT, Apps(Index(1), Index(0), Apps(DefCall(nelim), Index(2), Index(1), Index(0))), nelimTerm));
=======
ElimExpression nelimTerm = Elim(Index(0), nelimClauses, null);
nelim = new FunctionDefinition(new Namespace(new Utils.Name("nelim"), null), Abstract.Definition.DEFAULT_PRECEDENCE, lamArgs(Tele(vars("z"), Nat()), Tele(vars("s"), Pi(Nat(), Pi(Nat(), Nat()))), Tele(vars("x"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, nelimTerm);
nelimClauses.add(new Clause(Prelude.ZERO, new ArrayList<NameArgument>(), Abstract.Definition.Arrow.RIGHT, Index(1), nelimTerm));
nelimClauses.add(new Clause(Prelude.SUC, nameArgs(Name("x'")), Abstract.Definition.Arrow.RIGHT, Apps(Index(1), Index(0), Apps(DefCall(nelim), Index(2), Index(1), Index(0))), nelimTerm));
>>>>>>>
ElimExpression nelimTerm = Elim(Index(0), nelimClauses);
nelim = new FunctionDefinition(new Namespace(new Utils.Name("nelim"), null), Abstract.Definition.DEFAULT_PRECEDENCE, lamArgs(Tele(vars("z"), Nat()), Tele(vars("s"), Pi(Nat(), Pi(Nat(), Nat()))), Tele(vars("x"), Nat())), Nat(), Abstract.Definition.Arrow.LEFT, nelimTerm);
nelimClauses.add(new Clause(match(Prelude.ZERO), Abstract.Definition.Arrow.RIGHT, Index(1), nelimTerm));
nelimClauses.add(new Clause(match(Prelude.SUC, match("x")), Abstract.Definition.Arrow.RIGHT, Apps(Index(1), Index(0), Apps(DefCall(nelim), Index(2), Index(1), Index(0))), nelimTerm)); |
<<<<<<<
TypeCheckingError error = var.getErrorInfer(expr);
myVisitor.getErrorReporter().report(error);
=======
LocalTypeCheckingError error = var.getErrorInfer(expr);
myErrorReporter.report(error);
>>>>>>>
LocalTypeCheckingError error = var.getErrorInfer(expr);
myVisitor.getErrorReporter().report(error);
<<<<<<<
TypeCheckingError error = var.getErrorMismatch(expectedType.normalize(NormalizeVisitor.Mode.HUMAN_NF), actualType, expr);
myVisitor.getErrorReporter().report(error);
=======
LocalTypeCheckingError error = var.getErrorMismatch(expectedType.normalize(NormalizeVisitor.Mode.HUMAN_NF), actualType, expr);
myErrorReporter.report(error);
>>>>>>>
LocalTypeCheckingError error = var.getErrorMismatch(expectedType.normalize(NormalizeVisitor.Mode.HUMAN_NF), actualType, expr);
myVisitor.getErrorReporter().report(error); |
<<<<<<<
List<Expression> args = result.expression.getFunction().toConCall().getDataTypeArguments();
if (!compareExpressions(result, args.get(1), Apps(result.expression.getArguments().get(0), ConCall(Prelude.LEFT)), expr) ||
!compareExpressions(result, args.get(2), Apps(result.expression.getArguments().get(0), ConCall(Prelude.RIGHT)), expr)) {
return false;
}
=======
List<Expression> args = ((ConCallExpression) result.expression.getFunction()).getDataTypeArguments();
if (!compareExpressions(result, args.get(2), Apps(result.expression.getArguments().get(0), ConCall(Prelude.LEFT)), expr) ||
!compareExpressions(result, args.get(3), Apps(result.expression.getArguments().get(0), ConCall(Prelude.RIGHT)), expr)) {
return false;
>>>>>>>
List<Expression> args = result.expression.getFunction().toConCall().getDataTypeArguments();
if (!compareExpressions(result, args.get(2), Apps(result.expression.getArguments().get(0), ConCall(Prelude.LEFT)), expr) ||
!compareExpressions(result, args.get(3), Apps(result.expression.getArguments().get(0), ConCall(Prelude.RIGHT)), expr)) {
return false;
}
<<<<<<<
Universe argUniverse = domainTypes[i].normalize(NormalizeVisitor.Mode.WHNF).toUniverse().getUniverse();
Universe maxUniverse = universe.max(argUniverse);
if (maxUniverse == null) {
=======
Universe argUniverse = ((UniverseExpression) domainTypes[i].normalize(NormalizeVisitor.Mode.NF)).getUniverse();
if (universe == null) {
universe = argUniverse;
continue;
}
Universe.CompareResult cmp = universe.compare(argUniverse, null);
if (cmp == null) {
>>>>>>>
Universe argUniverse = ((UniverseExpression) domainTypes[i].normalize(NormalizeVisitor.Mode.NF)).getUniverse();
if (universe == null) {
universe = argUniverse;
continue;
}
Universe.CompareResult cmp = universe.compare(argUniverse, null);
if (cmp == null) {
<<<<<<<
Universe codomainUniverse = codomainResult.type.normalize(NormalizeVisitor.Mode.WHNF).toUniverse().getUniverse();
Universe maxUniverse = universe.max(codomainUniverse);
if (maxUniverse == null) {
String msg = "Universe " + codomainUniverse + " the codomain is not compatible with universe " + universe + " of arguments";
TypeCheckingError error = new TypeCheckingError(msg, expr);
expr.setWellTyped(myContext, Error(null, error));
myErrorReporter.report(error);
return null;
=======
Universe codomainUniverse = ((UniverseExpression) codomainResult.type.normalize(NormalizeVisitor.Mode.NF)).getUniverse();
if (universe != null) {
Universe.CompareResult cmp = universe.compare(codomainUniverse, null);
if (cmp == null) {
String msg = "Universe " + codomainUniverse + " the codomain is not compatible with universe " + universe + " of arguments";
TypeCheckingError error = new TypeCheckingError(msg, expr);
expr.setWellTyped(myContext, Error(null, error));
myErrorReporter.report(error);
return null;
}
Universe prop = new TypeUniverse(new TypeUniverse.TypeLevel(TypeUniverse.HomotopyLevel.PROP, false));
universe = codomainUniverse.equals(prop) ? prop : cmp.MaxUniverse;
} else {
universe = codomainUniverse;
>>>>>>>
Universe codomainUniverse = codomainResult.type.normalize(NormalizeVisitor.Mode.NF).toUniverse().getUniverse;
if (universe != null) {
Universe.CompareResult cmp = universe.compare(codomainUniverse, null);
if (cmp == null) {
String msg = "Universe " + codomainUniverse + " the codomain is not compatible with universe " + universe + " of arguments";
TypeCheckingError error = new TypeCheckingError(msg, expr);
expr.setWellTyped(myContext, Error(null, error));
myErrorReporter.report(error);
return null;
}
Universe prop = new TypeUniverse(new TypeUniverse.TypeLevel(TypeUniverse.HomotopyLevel.PROP, false));
universe = codomainUniverse.equals(prop) ? prop : cmp.MaxUniverse;
} else {
universe = codomainUniverse; |
<<<<<<<
myErrorReporter.report(new TypeMismatchError(termDoc(expectedType), termDoc(result.type), expr));
=======
if (!result.type.isInstance(ErrorExpression.class)) {
LocalTypeCheckingError error = new TypeMismatchError(termDoc(expectedType), termDoc(result.type), expr);
expr.setWellTyped(myContext, new ErrorExpression(result.expression, error));
myErrorReporter.report(error);
}
>>>>>>>
if (!result.type.isInstance(ErrorExpression.class)) {
myErrorReporter.report(new TypeMismatchError(termDoc(expectedType), termDoc(result.type), expr));
}
<<<<<<<
public Result finalCheckExpr(Concrete.Expression expr, ExpectedType expectedType) {
=======
public Result finalCheckExpr(Abstract.Expression expr, ExpectedType expectedType, boolean returnExpectedType) {
if (!(expectedType instanceof Expression)) {
returnExpectedType = false;
}
>>>>>>>
public Result finalCheckExpr(Concrete.Expression expr, ExpectedType expectedType, boolean returnExpectedType) {
if (!(expectedType instanceof Expression)) {
returnExpectedType = false;
}
<<<<<<<
LocalErrorReporterCounter counter = new LocalErrorReporterCounter(myErrorReporter);
result.expression = result.expression.strip(counter);
result.type = result.type.strip(counter.getErrorsNumber() == 0 ? myErrorReporter : DummyLocalErrorReporter.INSTANCE);
=======
LocalErrorReporterCounter counter = new LocalErrorReporterCounter(Error.Level.ERROR, myErrorReporter);
if (result.expression != null) {
result.expression = result.expression.strip(counter);
}
result.type = result.type.strip(counter.getErrorsNumber() == 0 ? myErrorReporter : new DummyLocalErrorReporter());
>>>>>>>
LocalErrorReporterCounter counter = new LocalErrorReporterCounter(Error.Level.ERROR, myErrorReporter);
if (result.expression != null) {
result.expression = result.expression.strip(counter);
}
result.type = result.type.strip(counter.getErrorsNumber() == 0 ? myErrorReporter : DummyLocalErrorReporter.INSTANCE);
<<<<<<<
public Type checkType(Concrete.Expression expr) {
=======
public Type checkType(Abstract.Expression expr, ExpectedType expectedType) {
>>>>>>>
public Type checkType(Concrete.Expression expr, ExpectedType expectedType) {
<<<<<<<
myErrorReporter.report(new TypeMismatchError(text("a universe"), termDoc(result.type), expr));
=======
if (!result.type.isInstance(ErrorExpression.class)) {
LocalTypeCheckingError error = new TypeMismatchError(text("a universe"), termDoc(result.type), expr);
expr.setWellTyped(myContext, new ErrorExpression(result.expression, error));
myErrorReporter.report(error);
}
>>>>>>>
if (!result.type.isInstance(ErrorExpression.class)) {
myErrorReporter.report(new TypeMismatchError(text("a universe"), termDoc(result.type), expr));
}
<<<<<<<
public Type finalCheckType(Concrete.Expression expr) {
Type result = checkType(expr);
=======
public Type finalCheckType(Abstract.Expression expr, ExpectedType expectedType) {
Type result = checkType(expr, expectedType);
>>>>>>>
public Type finalCheckType(Concrete.Expression expr, ExpectedType expectedType) {
Type result = checkType(expr, expectedType);
<<<<<<<
private SingleDependentLink visitTypeParameter(Concrete.TypeParameter param) {
Concrete.Expression paramType = param.getType();
Type argResult = checkType(paramType);
=======
private SingleDependentLink visitTypeParameter(Abstract.TypeParameter param) {
Abstract.Expression paramType = param.getType();
Type argResult = checkType(paramType, ExpectedType.OMEGA);
>>>>>>>
private SingleDependentLink visitTypeParameter(Concrete.TypeParameter param) {
Concrete.Expression paramType = param.getType();
Type argResult = checkType(paramType, ExpectedType.OMEGA);
<<<<<<<
myErrorReporter.report(new TypeMismatchError(termDoc(argExpectedType), termDoc(argType), paramType));
=======
if (!argType.isInstance(ErrorExpression.class)) {
myErrorReporter.report(new TypeMismatchError(termDoc(argExpectedType), termDoc(argType), paramType));
}
>>>>>>>
if (!argType.isInstance(ErrorExpression.class)) {
myErrorReporter.report(new TypeMismatchError(termDoc(argExpectedType), termDoc(argType), paramType));
}
<<<<<<<
if (result != null && expectedType != null && !(expectedType instanceof Expression)) {
myErrorReporter.report(new TypeMismatchError(typeDoc(expectedType), termDoc(result.type), expr));
return null;
=======
if (result != null) {
expr.setWellTyped(myContext, result.expression);
if (expectedType != null && !(expectedType instanceof Expression)) {
if (!result.type.isInstance(ErrorExpression.class)) {
myErrorReporter.report(new TypeMismatchError(typeDoc(expectedType), termDoc(result.type), expr));
}
return null;
}
>>>>>>>
if (result != null && expectedType != null && !(expectedType instanceof Expression)) {
if (!result.type.isInstance(ErrorExpression.class)) {
myErrorReporter.report(new TypeMismatchError(typeDoc(expectedType), termDoc(result.type), expr));
}
return null;
<<<<<<<
for (Concrete.TypeParameter arg : expr.getParameters()) {
Type result = checkType(arg.getType());
=======
for (Abstract.TypeParameter arg : expr.getParameters()) {
Type result = checkType(arg.getType(), ExpectedType.OMEGA);
>>>>>>>
for (Concrete.TypeParameter arg : expr.getParameters()) {
Type result = checkType(arg.getType(), ExpectedType.OMEGA);
<<<<<<<
for (Concrete.TypeParameter arg : parameters) {
Type result = checkType(arg.getType());
=======
for (Abstract.TypeParameter arg : parameters) {
Type result = checkType(arg.getType(), ExpectedType.OMEGA);
>>>>>>>
for (Concrete.TypeParameter arg : parameters) {
Type result = checkType(arg.getType(), ExpectedType.OMEGA);
<<<<<<<
myErrorReporter.report(new TypeMismatchError(text("A sigma type"), termDoc(exprResult.type), expr1));
=======
if (!exprResult.type.isInstance(ErrorExpression.class)) {
LocalTypeCheckingError error = new TypeMismatchError(text("A sigma type"), termDoc(exprResult.type), expr1);
expr.setWellTyped(myContext, new ErrorExpression(null, error));
myErrorReporter.report(error);
}
>>>>>>>
if (!exprResult.type.isInstance(ErrorExpression.class)) {
myErrorReporter.report(new TypeMismatchError(text("A sigma type"), termDoc(exprResult.type), expr1));
}
<<<<<<<
public boolean checkAllImplemented(ClassCallExpression classCall, Concrete.Expression expr) {
=======
private boolean checkAllImplemented(ClassCallExpression classCall, Abstract.Expression expr) {
>>>>>>>
private boolean checkAllImplemented(ClassCallExpression classCall, Concrete.Expression expr) { |
<<<<<<<
resultEquations.add(new CompareVisitor.Equation(holeExpression, Lam(lamArgs(Tele(vars("i"), DefCall(Prelude.INTERVAL))), type.normalize(NormalizeVisitor.Mode.NF))));
=======
resultEquations.add(new CompareVisitor.Equation(holeExpression, Lam("i", type.normalize(NormalizeVisitor.Mode.NF, myLocalContext))));
>>>>>>>
resultEquations.add(new CompareVisitor.Equation(holeExpression, Lam(lamArgs(Tele(vars("i"), DefCall(Prelude.INTERVAL))), type.normalize(NormalizeVisitor.Mode.NF, myLocalContext))));
<<<<<<<
TypeCheckingError error = new GoalError(myParent, myLocalContext, expectedType.normalize(NormalizeVisitor.Mode.NF), expr);
=======
TypeCheckingError error = new GoalError(myLocalContext, expectedType.normalize(NormalizeVisitor.Mode.NF, myLocalContext), expr);
>>>>>>>
TypeCheckingError error = new GoalError(myParent, myLocalContext, expectedType.normalize(NormalizeVisitor.Mode.NF, myLocalContext), expr);
<<<<<<<
=======
public Result visitFieldAcc(Abstract.FieldAccExpression expr, Expression expectedType) {
Result exprResult = typeCheck(expr.getExpression(), null);
if (!(exprResult instanceof OKResult)) return exprResult;
OKResult okExprResult = (OKResult) exprResult;
Expression type = okExprResult.type.normalize(NormalizeVisitor.Mode.WHNF, myLocalContext);
boolean notInScope = false;
if (type instanceof ClassExtExpression || type instanceof DefCallExpression && ((DefCallExpression) type).getDefinition() instanceof ClassDefinition) {
Definition parent = type instanceof ClassExtExpression ? ((ClassExtExpression) type).getBaseClass() : ((DefCallExpression) type).getDefinition();
Definition child = parent.findChild(expr.getName());
if (child != null) {
if (child.hasErrors()) {
TypeCheckingError error = new HasErrors(child.getName(), expr);
expr.setWellTyped(Error(DefCall(child), error));
myErrors.add(error);
return null;
} else {
Definition resultDef = child;
if (type instanceof ClassExtExpression && child instanceof FunctionDefinition) {
OverriddenDefinition overridden = ((ClassExtExpression) type).getDefinitionsMap().get(child);
if (overridden != null) {
resultDef = overridden;
}
}
Expression resultType = resultDef.getType();
if (resultType == null) {
resultType = child.getType();
}
return checkResult(expectedType, new OKResult(FieldAcc(okExprResult.expression, resultDef), resultType.accept(new ReplaceDefCallVisitor(parent, okExprResult.expression)), okExprResult.equations), expr);
}
}
notInScope = true;
}
TypeCheckingError error;
if (notInScope) {
error = new NotInScopeError(expr, expr.getName());
} else {
error = new TypeCheckingError("Expected an expression of a class type", expr.getExpression(), getNames(myLocalContext));
}
expr.setWellTyped(Error(null, error));
myErrors.add(error);
return null;
}
@Override
>>>>>>> |
<<<<<<<
=======
// Process implementations
Map<ClassField,Concrete.ClassFieldImpl> implementedHere = new LinkedHashMap<>();
for (Concrete.ClassFieldImpl classFieldImpl : def.getImplementations()) {
ClassField field = typechecker.referableToClassField(classFieldImpl.getImplementedField(), classFieldImpl);
if (field == null) {
classOk = false;
continue;
}
boolean isFieldAlreadyImplemented;
if (newDef) {
isFieldAlreadyImplemented = typedDef.isImplemented(field);
} else if (implementedHere.containsKey(field)) {
isFieldAlreadyImplemented = true;
} else {
isFieldAlreadyImplemented = false;
for (ClassDefinition superClass : typedDef.getSuperClasses()) {
if (superClass.isImplemented(field)) {
isFieldAlreadyImplemented = true;
break;
}
}
}
if (isFieldAlreadyImplemented) {
classOk = false;
alreadyImplementFields.add(field.getReferable());
alreadyImplementedSourceNode = classFieldImpl;
} else {
implementedHere.put(field, classFieldImpl);
}
}
>>>>>>>
<<<<<<<
DFS dfs = new DFS(typedDef, implementedHere.keySet());
if (implementedHere.isEmpty()) {
dfs.startNewFieldOrder();
}
List<ClassField> cycle = null;
=======
FieldDFS dfs = new FieldDFS(typedDef);
>>>>>>>
FieldDFS dfs = new FieldDFS(typedDef);
<<<<<<<
if (newDef && entry.getKey() == lastField) {
dfs.addDependencies(entry.getKey(), FieldsCollector.getFields(result.expression, parameter, typedDef.getFields()));
dfs.startNewFieldOrder();
for (ClassField field : typedDef.getFields()) {
cycle = dfs.findCycle(field);
if (cycle != null) {
break;
}
}
} else {
cycle = dfs.checkDependencies(entry.getKey(), FieldsCollector.getFields(result.expression, parameter, typedDef.getFields()));
}
=======
List<ClassField> cycle = dfs.checkDependencies(entry.getKey(), FieldsCollector.getFields(result.expression, thisBinding, typedDef.getFields()));
>>>>>>>
List<ClassField> cycle = dfs.checkDependencies(entry.getKey(), FieldsCollector.getFields(result.expression, thisBinding, typedDef.getFields()));
<<<<<<<
private static class DFS {
private final ClassDefinition classDef;
private final Map<ClassField, Boolean> state = new HashMap<>();
private final Map<ClassField, Set<ClassField>> references = new HashMap<>();
private final Set<? extends ClassField> implementedFields;
private List<ClassField> fieldOrder = null;
private DFS(ClassDefinition classDef, Set<? extends ClassField> implementedFields) {
this.classDef = classDef;
this.implementedFields = implementedFields;
}
List<ClassField> findCycle(ClassField field) {
List<ClassField> cycle = dfs(field);
if (cycle != null) {
Collections.reverse(cycle);
for (ClassField dep : cycle) {
references.remove(dep);
}
}
return cycle;
}
private List<ClassField> dfs(ClassField field) {
Boolean prevState = state.putIfAbsent(field, false);
if (Boolean.TRUE.equals(prevState)) {
return null;
}
if (Boolean.FALSE.equals(prevState)) {
List<ClassField> cycle = new ArrayList<>();
cycle.add(field);
return cycle;
}
Set<ClassField> deps = references.computeIfAbsent(field, f -> {
LamExpression impl = classDef.getImplementation(field);
PiExpression type = field.getType(Sort.STD);
Set<ClassField> result = FieldsCollector.getFields(type.getCodomain(), type.getParameters(), classDef.getFields());
if (impl != null) {
FieldsCollector.getFields(impl.getBody(), impl.getParameters(), classDef.getFields(), result);
}
return result;
});
for (ClassField dep : deps) {
List<ClassField> cycle = dfs(dep);
if (cycle != null) {
if (cycle.get(0) != field) {
cycle.add(field);
}
return cycle;
}
}
state.put(field, true);
if (fieldOrder != null && !classDef.isImplemented(field) && !implementedFields.contains(field)) {
fieldOrder.add(field);
}
return null;
}
List<ClassField> checkDependencies(ClassField field, Collection<? extends ClassField> dependencies) {
for (ClassField dependency : dependencies) {
if (dependency == field) {
return Collections.singletonList(field);
}
state.clear();
state.put(field, false);
List<ClassField> cycle = dfs(dependency);
if (cycle != null) {
Collections.reverse(cycle.subList(1, cycle.size()));
return cycle;
}
}
references.computeIfAbsent(field, f -> new HashSet<>()).addAll(dependencies);
return null;
}
void addDependencies(ClassField field, Collection<? extends ClassField> dependencies) {
state.clear();
references.computeIfAbsent(field, f -> new HashSet<>()).addAll(dependencies);
}
List<ClassField> getFieldOrder() {
return fieldOrder;
}
void startNewFieldOrder() {
fieldOrder = new ArrayList<>();
}
}
=======
>>>>>>> |
<<<<<<<
import static com.jetbrains.jetpad.vclang.term.definition.BaseDefinition.Helper.toNamespaceMember;
=======
import static com.jetbrains.jetpad.vclang.term.context.param.DependentLink.Helper.toSubstitution;
>>>>>>>
import static com.jetbrains.jetpad.vclang.term.definition.BaseDefinition.Helper.toNamespaceMember;
import static com.jetbrains.jetpad.vclang.term.context.param.DependentLink.Helper.toSubstitution; |
<<<<<<<
equations.add(new FieldCallExpression(field, this), impl, Equations.CMP.EQ, binding.getSourceNode(), binding);
=======
equations.add(FieldCallExpression.make(field, this), impl, Equations.CMP.EQ, myVar.getSourceNode(), myVar);
>>>>>>>
equations.add(FieldCallExpression.make(field, this), impl, Equations.CMP.EQ, binding.getSourceNode(), binding); |
<<<<<<<
private final Map<ClassField, String> myFields = new HashMap<>();
=======
private final Namespace myOwnNamespace;
private final Namespace myInstanceNamespace;
private final Map<String, ClassField> myFields = new HashMap<>();
>>>>>>>
private final Namespace myOwnNamespace;
private final Namespace myInstanceNamespace;
private final Map<ClassField, String> myFields = new HashMap<>(); |
<<<<<<<
List<? extends Expression> args = expr.getDefCallArguments();
DependentLink parameters = expr.getDefinition().getParameters();
// If the sort argument is \\Prop, the first argument can be a set of any level
if (expr.getDefinition() == Prelude.PATH_INFIX && expr.getSortArgument().isProp()) {
args.get(0).accept(this, new UniverseExpression(new Sort(Level.INFINITY, new Level(0))));
substitution.add(parameters, args.get(0));
args = args.subList(1, args.size());
parameters = parameters.getNext();
}
checkList(args, parameters, substitution, levelSubst);
var resultType = expr.getDefinition().getResultType().subst(substitution, levelSubst);
if (expr.getDefinition() == Prelude.DIV_MOD) {
if (args.size() >= 2) {
var arg2 = args.get(1);
var integer = arg2.cast(IntegerExpression.class);
if (integer != null && !integer.isZero()) {
resultType = GetTypeVisitor.modifyModType(Prelude.DIV_MOD, resultType, integer.pred());
}
var conCall = arg2.cast(ConCallExpression.class);
if (conCall != null && conCall.getDefinition() == Prelude.SUC) {
resultType = GetTypeVisitor.modifyModType(Prelude.DIV_MOD, resultType, conCall.getConCallArguments().get(0));
}
}
} else if (expr.getDefinition() == Prelude.MOD) {
if (args.size() >= 2) {
var arg2 = args.get(1);
var integer = arg2.cast(IntegerExpression.class);
if (integer != null && !integer.isZero()) {
resultType = GetTypeVisitor.modifyModType(Prelude.MOD, resultType, integer.pred());
}
var conCall = arg2.cast(ConCallExpression.class);
if (conCall != null && conCall.getDefinition() == Prelude.SUC) {
resultType = GetTypeVisitor.modifyModType(Prelude.MOD, resultType, conCall.getConCallArguments().get(0));
}
}
}
return check(expectedType, resultType, expr);
=======
checkList(expr.getDefCallArguments(), expr.getDefinition().getParameters(), substitution, levelSubst);
return check(expectedType, expr.getDefinition().getResultType().subst(substitution, levelSubst), expr);
>>>>>>>
List<? extends Expression> args = expr.getDefCallArguments();
checkList(args, expr.getDefinition().getParameters(), substitution, levelSubst);
var resultType = expr.getDefinition().getResultType().subst(substitution, levelSubst);
if (expr.getDefinition() == Prelude.DIV_MOD) {
if (args.size() >= 2) {
var arg2 = args.get(1);
var integer = arg2.cast(IntegerExpression.class);
if (integer != null && !integer.isZero()) {
resultType = GetTypeVisitor.modifyModType(Prelude.DIV_MOD, resultType, integer.pred());
}
var conCall = arg2.cast(ConCallExpression.class);
if (conCall != null && conCall.getDefinition() == Prelude.SUC) {
resultType = GetTypeVisitor.modifyModType(Prelude.DIV_MOD, resultType, conCall.getConCallArguments().get(0));
}
}
} else if (expr.getDefinition() == Prelude.MOD) {
if (args.size() >= 2) {
var arg2 = args.get(1);
var integer = arg2.cast(IntegerExpression.class);
if (integer != null && !integer.isZero()) {
resultType = GetTypeVisitor.modifyModType(Prelude.MOD, resultType, integer.pred());
}
var conCall = arg2.cast(ConCallExpression.class);
if (conCall != null && conCall.getDefinition() == Prelude.SUC) {
resultType = GetTypeVisitor.modifyModType(Prelude.MOD, resultType, conCall.getConCallArguments().get(0));
}
}
}
return check(expectedType, resultType, expr); |
<<<<<<<
realUgi.doAs((PrivilegedExceptionAction<Void>) () -> {
Connector conn = mac.getConnector(proxyPrincipal, new KerberosToken());
try (Scanner s = conn.createScanner(tableName, Authorizations.EMPTY)) {
s.iterator().hasNext();
Assert.fail("Expected to see an exception");
} catch (RuntimeException e) {
int numSecurityExceptionsSeen = Iterables
.size(Iterables.filter(Throwables.getCausalChain(e),
org.apache.accumulo.core.client.AccumuloSecurityException.class));
assertTrue("Expected to see at least one AccumuloSecurityException, but saw: "
+ Throwables.getStackTraceAsString(e), numSecurityExceptionsSeen > 0);
=======
realUgi.doAs(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
ZooKeeperInstance inst = new ZooKeeperInstance(mac.getClientConfig());
Connector conn = inst.getConnector(proxyPrincipal, new KerberosToken());
try {
Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
s.iterator().hasNext();
fail("Expected to see an exception");
} catch (RuntimeException e) {
int numSecurityExceptionsSeen = Iterables
.size(Iterables.filter(Throwables.getCausalChain(e),
org.apache.accumulo.core.client.AccumuloSecurityException.class));
assertTrue("Expected to see at least one AccumuloSecurityException, but saw: "
+ Throwables.getStackTraceAsString(e), numSecurityExceptionsSeen > 0);
}
return null;
>>>>>>>
realUgi.doAs((PrivilegedExceptionAction<Void>) () -> {
Connector conn = mac.getConnector(proxyPrincipal, new KerberosToken());
try (Scanner s = conn.createScanner(tableName, Authorizations.EMPTY)) {
s.iterator().hasNext();
fail("Expected to see an exception");
} catch (RuntimeException e) {
int numSecurityExceptionsSeen = Iterables
.size(Iterables.filter(Throwables.getCausalChain(e),
org.apache.accumulo.core.client.AccumuloSecurityException.class));
assertTrue("Expected to see at least one AccumuloSecurityException, but saw: "
+ Throwables.getStackTraceAsString(e), numSecurityExceptionsSeen > 0);
<<<<<<<
proxyUser2.doAs((PrivilegedExceptionAction<Void>) () -> {
Connector conn = mac.getConnector(userWithoutCredentials2,
new KerberosToken(userWithoutCredentials3));
try (Scanner s = conn.createScanner(tableName, Authorizations.EMPTY)) {
s.iterator().hasNext();
Assert.fail("Expected to see an exception");
} catch (RuntimeException e) {
int numSecurityExceptionsSeen = Iterables
.size(Iterables.filter(Throwables.getCausalChain(e),
org.apache.accumulo.core.client.AccumuloSecurityException.class));
assertTrue("Expected to see at least one AccumuloSecurityException, but saw: "
+ Throwables.getStackTraceAsString(e), numSecurityExceptionsSeen > 0);
=======
proxyUser2.doAs(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
ZooKeeperInstance inst = new ZooKeeperInstance(mac.getClientConfig());
Connector conn = inst.getConnector(userWithoutCredentials2,
new KerberosToken(userWithoutCredentials3));
try {
Scanner s = conn.createScanner(tableName, Authorizations.EMPTY);
s.iterator().hasNext();
fail("Expected to see an exception");
} catch (RuntimeException e) {
int numSecurityExceptionsSeen = Iterables
.size(Iterables.filter(Throwables.getCausalChain(e),
org.apache.accumulo.core.client.AccumuloSecurityException.class));
assertTrue("Expected to see at least one AccumuloSecurityException, but saw: "
+ Throwables.getStackTraceAsString(e), numSecurityExceptionsSeen > 0);
}
return null;
>>>>>>>
proxyUser2.doAs((PrivilegedExceptionAction<Void>) () -> {
Connector conn = mac.getConnector(userWithoutCredentials2,
new KerberosToken(userWithoutCredentials3));
try (Scanner s = conn.createScanner(tableName, Authorizations.EMPTY)) {
s.iterator().hasNext();
fail("Expected to see an exception");
} catch (RuntimeException e) {
int numSecurityExceptionsSeen = Iterables
.size(Iterables.filter(Throwables.getCausalChain(e),
org.apache.accumulo.core.client.AccumuloSecurityException.class));
assertTrue("Expected to see at least one AccumuloSecurityException, but saw: "
+ Throwables.getStackTraceAsString(e), numSecurityExceptionsSeen > 0);
<<<<<<<
proxyUser3.doAs((PrivilegedExceptionAction<Void>) () -> {
try {
mac.getConnector(userWithoutCredentials3, new KerberosToken(userWithoutCredentials3));
Assert.fail("Should not be able to create a Connector as this user cannot be proxied");
} catch (org.apache.accumulo.core.client.AccumuloSecurityException e) {
// Expected, this user cannot be proxied
=======
proxyUser3.doAs(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
ZooKeeperInstance inst = new ZooKeeperInstance(mac.getClientConfig());
try {
inst.getConnector(userWithoutCredentials3, new KerberosToken(userWithoutCredentials3));
fail("Should not be able to create a Connector as this user cannot be proxied");
} catch (org.apache.accumulo.core.client.AccumuloSecurityException e) {
// Expected, this user cannot be proxied
}
return null;
>>>>>>>
proxyUser3.doAs((PrivilegedExceptionAction<Void>) () -> {
try {
mac.getConnector(userWithoutCredentials3, new KerberosToken(userWithoutCredentials3));
fail("Should not be able to create a Connector as this user cannot be proxied");
} catch (org.apache.accumulo.core.client.AccumuloSecurityException e) {
// Expected, this user cannot be proxied |
<<<<<<<
import com.jetbrains.jetpad.vclang.term.definition.ClassDefinition;
import com.jetbrains.jetpad.vclang.term.definition.Definition;
import com.jetbrains.jetpad.vclang.term.definition.Name;
import com.jetbrains.jetpad.vclang.term.definition.ResolvedName;
import com.jetbrains.jetpad.vclang.typechecking.TypecheckingOrdering;
=======
import com.jetbrains.jetpad.vclang.term.definition.*;
import com.jetbrains.jetpad.vclang.typechecking.TypecheckingOrdering;
>>>>>>>
import com.jetbrains.jetpad.vclang.term.definition.*;
import com.jetbrains.jetpad.vclang.typechecking.TypecheckingOrdering;
<<<<<<<
ResolvedName moduleA = new ResolvedName(RootModule.ROOT, "A");
ResolvedName moduleB = new ResolvedName(RootModule.ROOT, "B");
sourceSupplier.add(moduleA, "\\abstract f : Nat \\function h => f");
sourceSupplier.add(moduleB, "\\static \\function g => A.h");
=======
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\function h => f");
sourceSupplier.add(moduleName("B"), "\\static \\function g => A.h");
>>>>>>>
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\function h => f");
sourceSupplier.add(moduleName("B"), "\\static \\function g => A.h");
<<<<<<<
ResolvedName module = new ResolvedName(RootModule.ROOT, "A");
sourceSupplier.add(module, "\\static \\abstract f : Nat");
=======
sourceSupplier.add(moduleName("A"), "\\static \\abstract f : Nat");
>>>>>>>
sourceSupplier.add(moduleName("A"), "\\static \\abstract f : Nat");
<<<<<<<
ResolvedName module = new ResolvedName(RootModule.ROOT, "A");
sourceSupplier.add(module, "\\abstract f : Nat \\static \\class C { \\abstract g : Nat \\function h => g }");
=======
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\static \\class C { \\abstract g : Nat \\function h => g }");
>>>>>>>
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\static \\class C { \\abstract g : Nat \\function h => g }");
<<<<<<<
ResolvedName moduleA = new ResolvedName(RootModule.ROOT, "A");
ResolvedName moduleB = new ResolvedName(RootModule.ROOT, "B");
sourceSupplier.add(moduleA, "\\abstract f : Nat \\static \\class B { \\abstract g : Nat \\function h => g }");
sourceSupplier.add(moduleB, "\\static \\function f (p : A.B) => p.h");
=======
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\static \\class B { \\abstract g : Nat \\function h => g }");
sourceSupplier.add(moduleName("B"), "\\static \\function f (p : A.B) => p.h");
>>>>>>>
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\static \\class B { \\abstract g : Nat \\function h => g }");
sourceSupplier.add(moduleName("B"), "\\static \\function f (p : A.B) => p.h");
<<<<<<<
ResolvedName moduleA = new ResolvedName(RootModule.ROOT, "A");
ResolvedName moduleB = new ResolvedName(RootModule.ROOT, "B");
sourceSupplier.add(moduleA, "\\abstract f : Nat \\static \\class B { \\abstract g : Nat \\function h => g }");
sourceSupplier.add(moduleA, "\\abstract f : Nat \\class B { \\abstract g : Nat \\static \\function (+) (f g : Nat) => f \\function h => f + g }");
sourceSupplier.add(moduleB, "\\static \\function f (p : A.B) => p.h");
=======
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\class B { \\abstract g : Nat \\static \\function (+) (f g : Nat) => f \\function h => f + g }");
sourceSupplier.add(moduleName("B"), "\\static \\function f (p : A.B) => p.h");
>>>>>>>
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\static \\class B { \\abstract g : Nat \\function h => g }");
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat \\class B { \\abstract g : Nat \\static \\function (+) (f g : Nat) => f \\function h => f + g }");
sourceSupplier.add(moduleName("B"), "\\static \\function f (p : A.B) => p.h");
<<<<<<<
ResolvedName moduleA = new ResolvedName(RootModule.ROOT, "A");
ResolvedName moduleB = new ResolvedName(RootModule.ROOT, "B");
sourceSupplier.add(moduleA, "\\abstract f : Nat");
sourceSupplier.add(moduleB, "\\function g => A.f");
=======
sourceSupplier.add(moduleName("A"), "\\function f : Nat");
sourceSupplier.add(moduleName("B"), "\\function g => A.f");
>>>>>>>
sourceSupplier.add(moduleName("A"), "\\abstract f : Nat");
sourceSupplier.add(moduleName("B"), "\\function g => A.f"); |
<<<<<<<
// first call to isSupported should be true
Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
=======
// first call to issupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
>>>>>>>
// first call to isSupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
<<<<<<<
// first call to isSupported should be true
Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
=======
// first call to issupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
>>>>>>>
// first call to isSupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
<<<<<<<
results.add(service.submit(() -> {
Assert.assertNotNull(al + " should not be null", al.getCodec());
return true;
=======
results.add(service.submit(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
assertNotNull(al + " should not be null", al.getCodec());
return true;
}
>>>>>>>
results.add(service.submit(() -> {
assertNotNull(al + " should not be null", al.getCodec());
return true;
<<<<<<<
// first call to isSupported should be true
Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
=======
// first call to issupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
>>>>>>>
// first call to isSupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
<<<<<<<
results.add(service.submit(() -> {
Assert.assertNotNull(al + " should have a non-null codec", al.getCodec());
return true;
=======
results.add(service.submit(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
assertNotNull(al + " should have a non-null codec", al.getCodec());
return true;
}
>>>>>>>
results.add(service.submit(() -> {
assertNotNull(al + " should have a non-null codec", al.getCodec());
return true;
<<<<<<<
// first call to isSupported should be true
Assert.assertTrue(al + " is not supported, but should be", al.isSupported());
=======
// first call to issupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
>>>>>>>
// first call to isSupported should be true
assertTrue(al + " is not supported, but should be", al.isSupported());
<<<<<<<
list.add(() -> {
CompressionCodec codec = al.getCodec();
Assert.assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
synchronized (testSet) {
testSet.add(System.identityHashCode(codec));
=======
list.add(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
CompressionCodec codec = al.getCodec();
assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
synchronized (testSet) {
testSet.add(System.identityHashCode(codec));
}
return true;
>>>>>>>
list.add(() -> {
CompressionCodec codec = al.getCodec();
assertNotNull(al + " resulted in a non-null codec", codec);
// add the identity hashcode to the set.
synchronized (testSet) {
testSet.add(System.identityHashCode(codec)); |
<<<<<<<
args.add(new PatternArgument(readPattern(argProto.getPattern(), prev), !argProto.getNotExplicit()));
=======
args.add(new PatternArgument(readPattern(argProto.getPattern(), list), !argProto.getNotExplicit(), argProto.getHidden()));
>>>>>>>
args.add(new PatternArgument(readPattern(argProto.getPattern(), list), !argProto.getNotExplicit()));
<<<<<<<
if (prev[0] != null) prev[0].setNext(param1);
prev[0] = param1;
return new EmptyPattern(param1);
=======
list.append(param1);
return new AnyConstructorPattern(param1);
>>>>>>>
list.append(param1);
return new EmptyPattern(param1); |
<<<<<<<
@Nonnull
=======
@NotNull
@Override
>>>>>>>
@NotNull |
<<<<<<<
myDataStream.writeInt(myDefNamesIndicies.getDefNameIndex(new ResolvedName(constructor.getParentNamespace(), constructor.getName()), false));
myDataStream.writeInt(((ConstructorPattern) pattern).getArguments().size());
for (PatternArgument patternArg : ((ConstructorPattern) pattern).getArguments()) {
visitPatternArg(patternArg);
=======
myDataStream.writeInt(myDefNamesIndices.getDefNameIndex(new ResolvedName(constructor.getParentNamespace(), constructor.getName()), false));
myDataStream.writeInt(((ConstructorPattern) pattern).getPatterns().size());
for (Pattern nestedPattern : ((ConstructorPattern) pattern).getPatterns()) {
visitPattern(nestedPattern);
>>>>>>>
myDataStream.writeInt(myDefNamesIndices.getDefNameIndex(new ResolvedName(constructor.getParentNamespace(), constructor.getName()), false));
myDataStream.writeInt(((ConstructorPattern) pattern).getArguments().size());
for (PatternArgument patternArg : ((ConstructorPattern) pattern).getArguments()) {
visitPatternArg(patternArg); |
<<<<<<<
protected void visitClassFieldImpls(List<Concrete.ClassFieldImpl> classFieldImpls, Void params) {
=======
protected void visitClassFieldImpls(List<Concrete.ClassFieldImpl> classFieldImpls) {
if (classFieldImpls.isEmpty()) {
return;
}
>>>>>>>
protected void visitClassFieldImpls(List<Concrete.ClassFieldImpl> classFieldImpls, Void params) {
if (classFieldImpls.isEmpty()) {
return;
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.