svnno****@sourc*****
svnno****@sourc*****
2009年 7月 3日 (金) 22:35:37 JST
Tera TermRevision: 3574
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3574
Author: yutakapon
Date: 2009-07-03 22:35:37 +0900 (Fri, 03 Jul 2009)
Log Message:
-----------
1ã¤ã®è¡Œã«ã€è¤‡æ•°ã®ã‚³ãƒ¡ãƒ³ãƒˆãŒã‚ã‚‹å ´åˆã«å¯¾å¿œã•ã›ãŸã€‚
messagebox "message" "title" /*comment*/ /*comment2*/
Modified Paths:
--------------
trunk/teraterm/ttpmacro/ttmparse.c
-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttmparse.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.c 2009-07-03 13:11:48 UTC (rev 3573)
+++ trunk/teraterm/ttpmacro/ttmparse.c 2009-07-03 13:35:37 UTC (rev 3574)
@@ -333,7 +333,12 @@
/* CŒ¾ŒêƒRƒƒ“ƒg‚ª•Â‚¶‚ç‚ê‚Ä‚¢‚é‚©‚Ç‚¤‚© */
int IsCommentClosed(void)
{
+#ifdef SUPPORT_C_STYLE_COMMENT
return (commenting == 0);
+#else
+ // “–ŠY‹@”\‚ª–³Œø‚ÌꇂÍAí‚Éu^v‚ð•Ô‚·B
+ return 1;
+#endif
}
BYTE GetFirstChar()
@@ -379,34 +384,40 @@
}
/* CŒ¾ŒêƒRƒƒ“ƒg‚ÌŽn‚Ü‚è */
- if (LineBuff[LinePtr] == '/' && LineBuff[LinePtr + 1] == '*') {
- comment_starting = 1;
- LinePtr += 2;
- while (LinePtr < LineLen) {
- /* ƒRƒƒ“ƒg‚ÌI‚í‚肪o‚Ä‚‚é‚܂ŃXƒLƒbƒv */
- if (LineBuff[LinePtr] == '*' && LineBuff[LinePtr + 1] == '/') {
- LinePtr += 2;
- comment_starting = 0;
- break;
+ do {
+ if (LineBuff[LinePtr] == '/' && LineBuff[LinePtr + 1] == '*') {
+ comment_starting = 1;
+ LinePtr += 2;
+ while (LinePtr < LineLen) {
+ /* ƒRƒƒ“ƒg‚ÌI‚í‚肪o‚Ä‚‚é‚܂ŃXƒLƒbƒv */
+ if (LineBuff[LinePtr] == '*' && LineBuff[LinePtr + 1] == '/') {
+ LinePtr += 2;
+ comment_starting = 0;
+ break;
+ }
+ LinePtr++;
}
- LinePtr++;
- }
- if (LinePtr < LineLen)
- b = LineBuff[LinePtr];
- else
- b = 0;
+ if (LinePtr < LineLen)
+ b = LineBuff[LinePtr];
+ else
+ b = 0;
- while ((LinePtr<LineLen) && ((b==' ') || (b=='\t')))
- {
- LinePtr++;
- if (LinePtr<LineLen) b = LineBuff[LinePtr];
+ while ((LinePtr<LineLen) && ((b==' ') || (b=='\t')))
+ {
+ LinePtr++;
+ if (LinePtr<LineLen) b = LineBuff[LinePtr];
+ }
+
+ /* ƒRƒƒ“ƒg‚ÌI‚í‚肪ˆês‚É“oꂵ‚È‚¢ê‡‚ÍA‰i‘±“I‚É‹L˜^‚·‚éB*/
+ if (comment_starting)
+ commenting = 1;
}
- /* ƒRƒƒ“ƒg‚ÌI‚í‚肪ˆês‚É“oꂵ‚È‚¢ê‡‚ÍA‰i‘±“I‚É‹L˜^‚·‚éB*/
- if (comment_starting)
- commenting = 1;
- }
+ /* 1‚‚Ìs‚ÉA•¡”‚̃Rƒƒ“ƒg‚ª‚ ‚éꇂɑΉž‚·‚邽‚ßAŽŸ‚Ì•¶Žš‚ªƒXƒ‰ƒbƒVƒ…‚È‚ç‚ÎA
+ * ƒ‹[ƒvˆ—‚ÌŽn‚ß‚É–ß‚·B
+ */
+ } while (b == '/');
#endif
if ((b>' ') && (b!=';'))