Changeset 13489 for lang/hsp

Timestamp:

06/08/08 17:42:47 (5 years ago)

Author:

fujidig

Message:

ドキュメント行頭 *' 以降のスペース読み飛ばしでサンプルスクリプトのインデントなんかも読み飛ばしてしまうので、最初のスペースと同じだけしか読み飛ばさないように変更

Location:

lang/hsp/misc/hsp2hs

Files:

• mod_hsp2hs.hsp (modified) (6 diffs)
• mod_strutils.hsp (modified) (2 diffs)

lang/hsp/misc/hsp2hs/mod_hsp2hs.hsp

@@ -3 +3 @@
  * HSP �X�N���v�g�����ߍ��݃h�L�������g����s �t�@�C���𐶐����郂�W���[��
  * @author fujidig
- * @date 2008/06/05
+ * @date 2008/06/08
  * @ver 1.0.1
  */
@@ -52 +52 @@
                 dlnptr = 0
 
-                dlnptr += spnspace(dln, dlnptr)
-                if peek(dln, dlnptr) == 0 : continue
-
                 if peek(tag) == 0 & peek(dln, dlnptr) != '@' {
-                        // �O���X�y�[�X���Ă��܂��d�l���ƃX�N���v�g��������ɖ����H�i�X�y�[�X�ƃ^�u�̍��ʉ�����΂����H�j
                         astr = strmid(dln, dlnptr, 9999)
-                        stripstr astr
                         if summary == "" {
                                 summary = astr
@@ -148 +143 @@
                         } else {
                                 lnptr ++
-                                lnptr += spnspace(ln, lnptr)
                                 if status == STATUS_DOC1 {
+                                        lnptr += spnstr(ln, lnptr, doc_space)
                                         if strmid(ln, lnptr, 14) == "==/hspmodule==" {
                                                 status = STATUS_DOCEND
@@ -157 +152 @@
                                         continue
                                 }
+                                sz = spnspace(ln, lnptr)
+                                doc_space = strmid(ln, lnptr, sz)
+                                lnptr += sz
                                 if strmid(ln, lnptr, 13) == "==hspmodule==" {
                                         doc = ""
@@ -173 +171 @@
                                         lnptr ++
                                         ins --
-                                        sz = spnspace(ln, lnptr)
+                                        if is_doc_space {
+                                                sz = spnstr(ln, lnptr, doc_space)
+                                        } else {
+                                                sz = spnspace(ln, lnptr)
+                                                doc_space = strmid(ln, lnptr, sz)
+                                                is_doc_space = 1
+                                        }
                                         lnptr += sz
                                         ins -= sz
@@ -187 +191 @@
                                 doc_start_lineno = cnt
                                 status = STATUS_DOC2
+                                doc_space = ""
+                                is_doc_space = 0
                                 goto *redo
                         }

lang/hsp/misc/hsp2hs/mod_strutils.hsp

@@ -3 +3 @@
  * ��������[�e�B���e�B���W���[��
  * @author fujidig
- * @date 2008/06/03
+ * @date 2008/06/08
  * @ver 1.0.0
  */
@@ -82 +82 @@
         return
 
+/**
+ * ������w���u�Ƃ����̕�����擪���瓯�����̑����o�C�g���𐔂���* ������ϐ� a �̃C���f�b�N�X p �ƕ�����ϐ� b �̐擪���瓯�����̑����o�C�g���𐔂��܂��B
+ * @param a ������ϐ�
+ * @param p a �̃C���f�b�N�X
+ * @param b ������ϐ�
+ */
+#defcfunc spnstr var a, int p, var b
+        repeat
+                c1 = peek(a, p+cnt)
+                c2 = peek(b, cnt)
+                if c1 != c2 | c1 == 0 : i = cnt : break
+        loop
+        return i
+
 #global
 #endif