svnno****@sourc*****
svnno****@sourc*****
2010年 8月 21日 (土) 17:18:06 JST
Tera TermRevision: 4033
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4033
Author: maya
Date: 2010-08-21 17:18:06 +0900 (Sat, 21 Aug 2010)
Log Message:
-----------
strjoin, strtrim, strsplit マクãƒã‚³ãƒžãƒ³ãƒ‰ã® special 引数を削除ã—ãŸ
Modified Paths:
--------------
trunk/doc/en/html/macro/command/strjoin.html
trunk/doc/en/html/macro/command/strsplit.html
trunk/doc/en/html/macro/command/strtrim.html
trunk/doc/ja/html/macro/command/strjoin.html
trunk/doc/ja/html/macro/command/strsplit.html
trunk/doc/ja/html/macro/command/strtrim.html
trunk/teraterm/ttpmacro/ttl.c
-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/strjoin.html
===================================================================
--- trunk/doc/en/html/macro/command/strjoin.html 2010-08-21 04:50:45 UTC (rev 4032)
+++ trunk/doc/en/html/macro/command/strjoin.html 2010-08-21 08:18:06 UTC (rev 4033)
@@ -20,7 +20,7 @@
<h2>Format</h2>
<pre class="macro-syntax">
-strjoin <strvar> <separator> <count> [<special>]
+strjoin <strvar> <separator> <count>
</pre>
<h2>Remarks</h2>
@@ -37,30 +37,6 @@
The <count> is specified the maximum number of substrings to concatenate.
</p>
-<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
-</p>
-
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<h2>Example</h2>
<pre class="macro-example">
Modified: trunk/doc/en/html/macro/command/strsplit.html
===================================================================
--- trunk/doc/en/html/macro/command/strsplit.html 2010-08-21 04:50:45 UTC (rev 4032)
+++ trunk/doc/en/html/macro/command/strsplit.html 2010-08-21 08:18:06 UTC (rev 4033)
@@ -20,7 +20,7 @@
<h2>Format</h2>
<pre class="macro-syntax">
-strsplit <strval> <separator> <count> [<special>]
+strsplit <strval> <separator> <count>
</pre>
<h2>Remarks</h2>
@@ -38,30 +38,6 @@
If a number of substrings is smaller than <count>, the remaining groupmatchstr variables stores NULL.
</p>
-<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
-</p>
-
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<!--p>
ŽÀÛ‚É•ªŠ„‚³‚ꂽŒÂ”‚ðƒVƒXƒeƒ€•Ï” result ‚ÉŠi”[‚·‚éB
</p-->
Modified: trunk/doc/en/html/macro/command/strtrim.html
===================================================================
--- trunk/doc/en/html/macro/command/strtrim.html 2010-08-21 04:50:45 UTC (rev 4032)
+++ trunk/doc/en/html/macro/command/strtrim.html 2010-08-21 08:18:06 UTC (rev 4033)
@@ -20,7 +20,7 @@
<h2>Format</h2>
<pre class="macro-syntax">
-strtrim <strvar> <trimchars> [<special>]
+strtrim <strvar> <trimchars>
</pre>
<h2>Remarks</h2>
@@ -29,30 +29,6 @@
Removes all occurrences of a set of characters specified in the <trimchars> from the beginning end end of the string variable <strvar>.
</p>
-<p>
-If <special> is non-zero, following strings in <message> is treated as spacial character.<br>
-If <special> is not specified then 1 is used.
-</p>
-
-<table>
- <tr>
- <th>input</th>
- <th>output</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>line feed</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>tab</td>
- </tr>
-</table>
-
<h2>Example</h2>
<pre class="macro-example">
Modified: trunk/doc/ja/html/macro/command/strjoin.html
===================================================================
--- trunk/doc/ja/html/macro/command/strjoin.html 2010-08-21 04:50:45 UTC (rev 4032)
+++ trunk/doc/ja/html/macro/command/strjoin.html 2010-08-21 08:18:06 UTC (rev 4033)
@@ -20,7 +20,7 @@
<h2>Œ`Ž®</h2>
<pre class="macro-syntax">
-strjoin <strvar> <separator> <count> [<special>]
+strjoin <strvar> <separator> <count>
</pre>
<h2>‰ðà</h2>
@@ -37,30 +37,6 @@
<count> ‚É‚ÍA˜AŒ‹‚·‚é•”•ª•¶Žš—ñ‚ÌÅ‘å”i9ˆÈ‰ºj‚ðŽw’è‚·‚éB
</p>
-<p>
-<special> ‚ª 1 ‚ÌꇂÍA<separator> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚éB<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚éB
-</p>
-
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
<h2>—á</h2>
<pre class="macro-example">
Modified: trunk/doc/ja/html/macro/command/strsplit.html
===================================================================
--- trunk/doc/ja/html/macro/command/strsplit.html 2010-08-21 04:50:45 UTC (rev 4032)
+++ trunk/doc/ja/html/macro/command/strsplit.html 2010-08-21 08:18:06 UTC (rev 4033)
@@ -20,7 +20,7 @@
<h2>Œ`Ž®</h2>
<pre class="macro-syntax">
-strsplit <strval> <separator> <count> [<special>]
+strsplit <strval> <separator> <count>
</pre>
<h2>‰ðà</h2>
@@ -39,30 +39,6 @@
</p>
<p>
-<special> ‚ª 1 ‚ÌꇂÍA<separator> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚éB<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚éB
-</p>
-
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
-<p>
ŽÀÛ‚É•ªŠ„‚³‚ꂽŒÂ”‚ðƒVƒXƒeƒ€•Ï” result ‚ÉŠi”[‚·‚éB
</p>
Modified: trunk/doc/ja/html/macro/command/strtrim.html
===================================================================
--- trunk/doc/ja/html/macro/command/strtrim.html 2010-08-21 04:50:45 UTC (rev 4032)
+++ trunk/doc/ja/html/macro/command/strtrim.html 2010-08-21 08:18:06 UTC (rev 4033)
@@ -20,7 +20,7 @@
<h2>Œ`Ž®</h2>
<pre class="macro-syntax">
-strtrim <strvar> <trimchars> [<special>]
+strtrim <strvar> <trimchars>
</pre>
<h2>‰ðà</h2>
@@ -29,30 +29,6 @@
•¶Žš—ñ•Ï” <strvar>‚Ì擪‚Æ––”ö‚©‚çA<trimchars> ‚ÅŽw’肳‚ꂽ•¶Žš‚ð‚·‚×‚Ä휂·‚éB
</p>
-<p>
-<special> ‚ª 1 ‚ÌꇂÍA<separator> ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš—ñ‚Í“ÁŽê•¶Žš‚Æ‚µ‚Ĉµ‚í‚ê‚éB<br>
-<special> ‚ªŽw’肳‚ê‚È‚¢ê‡‚Í 1 ‚ªŽg—p‚³‚ê‚éB
-</p>
-
-<table>
- <tr>
- <th>“ü—Í</th>
- <th>o—Í</th>
- </tr>
- <tr>
- <td>\\</td>
- <td>"\"</td>
- </tr>
- <tr>
- <td>\n</td>
- <td>‰üs</td>
- </tr>
- <tr>
- <td>\t</td>
- <td>ƒ^ƒu</td>
- </tr>
-</table>
-
<h2>—á</h2>
<pre class="macro-example">
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2010-08-21 04:50:45 UTC (rev 4032)
+++ trunk/teraterm/ttpmacro/ttl.c 2010-08-21 08:18:06 UTC (rev 4033)
@@ -3567,29 +3567,18 @@
TStrVal trimchars;
WORD Err, VarId;
int srclen;
- int i, start, end, sp;
+ int i, start, end;
char *srcptr, *p;
char table[256];
Err = 0;
GetStrVar(&VarId,&Err);
GetStrVal(trimchars,&Err);
- // get 3rd arg(optional) if given
- if (CheckParameterGiven()) {
- GetIntVal(&sp, &Err);
- } else {
- /* ƒfƒtƒHƒ‹ƒg‚ͧŒäƒR[ƒhˆµ‚¢‚Æ‚·‚éB*/
- sp = 1;
- }
+
if ((Err==0) && (GetFirstChar()!=0))
Err = ErrSyntax;
if (Err!=0) return Err;
- if (sp) {
- // ‰üsƒR[ƒh‚ð•ÏŠ·‚·‚é
- RestoreNewLine(trimchars);
- }
-
srcptr = StrVarPtr(VarId);
srclen = strlen(srcptr);
@@ -3631,7 +3620,7 @@
#define MAXVARNUM 9
TStrVal src, delimchars, buf;
WORD Err;
- int maxvar, sp;
+ int maxvar;
int srclen, len;
int i, count;
char *p;
@@ -3641,13 +3630,7 @@
GetStrVal(src,&Err);
GetStrVal(delimchars,&Err);
GetIntVal(&maxvar,&Err);
- // get 3rd arg(optional) if given
- if (CheckParameterGiven()) {
- GetIntVal(&sp, &Err);
- } else {
- /* ƒfƒtƒHƒ‹ƒg‚ͧŒäƒR[ƒhˆµ‚¢‚Æ‚·‚éB*/
- sp = 1;
- }
+
if ((Err==0) && (GetFirstChar()!=0))
Err = ErrSyntax;
if (Err!=0) return Err;
@@ -3655,11 +3638,6 @@
if (maxvar < 1 || maxvar > MAXVARNUM)
return ErrSyntax;
- if (sp) {
- // ‰üsƒR[ƒh‚ð•ÏŠ·‚·‚é
- RestoreNewLine(delimchars);
- }
-
// ƒfƒŠƒ~ƒ^‚Í1•¶Žš‚Ì‚Ý‚Æ‚·‚éB
len = strlen(delimchars);
if (len != 1)
@@ -3733,7 +3711,7 @@
TStrVal delimchars, buf;
WORD Err, VarId;
WORD VarType;
- int maxvar, sp;
+ int maxvar;
int srclen;
int i;
char *srcptr, *p;
@@ -3742,13 +3720,7 @@
GetStrVar(&VarId,&Err);
GetStrVal(delimchars,&Err);
GetIntVal(&maxvar,&Err);
- // get 3rd arg(optional) if given
- if (CheckParameterGiven()) {
- GetIntVal(&sp, &Err);
- } else {
- /* ƒfƒtƒHƒ‹ƒg‚ͧŒäƒR[ƒhˆµ‚¢‚Æ‚·‚éB*/
- sp = 1;
- }
+
if ((Err==0) && (GetFirstChar()!=0))
Err = ErrSyntax;
if (Err!=0) return Err;
@@ -3756,11 +3728,6 @@
if (maxvar < 1 || maxvar > MAXVARNUM)
return ErrSyntax;
- if (sp) {
- // ‰üsƒR[ƒh‚ð•ÏŠ·‚·‚é
- RestoreNewLine(delimchars);
- }
-
srcptr = StrVarPtr(VarId);
srclen = strlen(srcptr);