Differences between revisions 23 and 30 (spanning 7 versions)

CompareSimple

(Show (Hide table-of-contents) table-of-contents)

Contents

CompareSimple

CompareSimple is part of the CategoryAplTree project.

Overview

CompareSimple offers a couple of methods designed to compare functions, operators, scripts and files. It is also able to deal with SALTed files as well as acre component files.

Methods

There are just two main functions:

Match

Match takes names of functions or operators or scripts and compares the source code. Note that taking the source code with ⎕CR or ⎕SRC and then ≡ them is not always going to work: white spaces as well as formatting problems might result in a 0 when the source code is in fact identicall. Match deals with these problems properly.

These

These accepts a variety of arguments listed underneath. According to its arguments it tries to figure out what your intention is and carries out the appropriate action.

Note that whenever the word "function" is used here it can also be a defined operator (which is in Dyalog APL a derived function anyway).

Script / script

Compare the two scripts. Note that you can specify name(s) as well as reference(s).

Script / name of a *.dyalog file

Compare the workspace script with the file.

Script

This syntax requires "Script" to be managed either by SALT or by acre.

If it is managed by acre then a dialog pops up with the number of all versions saved by acre.
If it is managed by SALT the workspace script is compared with its SALTed source file.

Note however that for acre this requires the script in question to be a member of an opened acre project at the time the comparison is carried out.

Name of a native file / name of a native file

Compare the two files.

Function name / function name

Compare two functions in the workspace.

Function name / name of a native file

Compare the function in the workspace with the file.

Function name / name of an acre component file

Compare the function in the workspace with the acre component file.

Function name

If it is managed by acre then a dialog pops up with the number of all versions saved by acre.

Note that the function in question must be a member of an opened acre project at the time the comparison is carried out.

Namespace / namespace

Note that this works only with named namespaces, although the argument might be either references or names pointing to the two namespaces.

Project Page

For bug reports, future enhancements and a full version history see CompareSimple/ProjectPage

Version Information

Original author:	KaiJaeger
Responsible:	KaiJaeger
Email:	kai@aplteam.com

CategoryAplTree

-  ⇤ ← Revision 23 as of 2011-08-18 16:23:59 → 
  Size: 3698
  Editor: KaiJaeger
  Comment:
+   ← Revision 30 as of 2013-12-09 19:09:05 → ⇥
  Size: 2996
  Editor: KaiJaeger
  Comment: New features in "These"
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-= Compare =
+= CompareSimple =
 Line 6:
-`Compare` is part of the CategoryAplTree project.
+`CompareSimple` is part of the CategoryAplTree project.
 Line 10:
-`Compare` offers a couple of methods designed to compare functions, operators and scripts. It is also able to deal with SALTed files as well as `acre` component files.
+`CompareSimple` offers a couple of methods designed to compare functions, operators, scripts and files. It is also able to deal with SALTed files as well as `acre` component files.
 Line 14:
-There are three main functions:
+There are just two main functions:
 Line 22:
-`These` accepts a varity of arguments listed underneath. According to its arguments it tries to figure out what your intention is and carries out the appropriate action.
+`These` accepts a variety of arguments listed underneath. According to its arguments it tries to figure out what your intention is and carries out the appropriate action.
 Line 24:
-==== Script / Script ====
+Note that whenever the word "function" is used here it can also be a defined operator (which is in Dyalog APL a derived function anyway).

==== Script / script ====
-Line 31:
+Line 33:
-This syntax requeires "Script" to be a SALTed script. In that case the workspace script is compared with its SALTed source file.
+This syntax requires "Script" to be managed either by SALT or by acre. 
 
 * If it is managed by acre then a dialog pops up with the number of all versions saved by acre.
 * If it is managed by SALT the workspace script is compared with its SALTed source file.

Note however that for acre this requires the script in question to be a member of an opened acre project at the time the comparison is carried out.
-Line 42:
+Line 49:
-==== Function name / name of an `acre` component file ====
+==== Function name / name of an acre component file ====
-Line 46:
+Line 53:
- If there is an `acre` component file holding that function the workspace version is compared with any of the components.
+If it is managed by acre then a dialog pops up with the number of all versions saved by acre.

Note that the function in question must be a member of an opened acre project at the time the comparison is carried out.
-Line 51:
+Line 60:
-This is essentially the same as the `Merge` method but in read-only-mode.

=== Merge ===

Although this method works "only" on (named!) namespaces one can effectively use it to compare and merge workspaces by copying the two workspaces into two separate namespaces.

The `Merge` method presents a GUI with all the information one needs to know in order to perform the merge. Note that all functions, operators and scripts that do equal are on the `=` tab while all the others are on the `≠` tab. Normally one is interested only in the `≠` tab:

{{attachment:Merger.png}}

There are methods available that makes it easy to compare, modify, delete (either from the GUI or the workspace) and move functions, operators and scripts from one namepsace to the other:

{{attachment:ContextMenu.png}}
-Line 67:
+Line 62:
-For bug reports, future enhancements and a full version history see [[Compare/ProjectPage]]
+For bug reports, future enhancements and a full version history see [[CompareSimple/ProjectPage]]
-Line 74:
+Line 69:
-== Download ==
You have two options: you can either download the script for usage:

[[http://aplwiki.com/Compare?action=AttachFile&do=get&target=Compare.ZIP|Download Compare script right now]]

or get the whole thing from the AplWikiRepository, including the development workspace and the script and maybe more for any development or for running the test cases:

/* You might want to exchange "dyalog" here: */
{{{
svn list svn://aplteam.com/os/dyalog/Compare/
}}}
+<<Include(APLTreeDownloads)>>