Changeset 509 for branches/IDLDOC_3_1

Timestamp:

06/19/08 19:10:01 (4 years ago)

Author:

mgalloy

Message:

Changes from IDLdoc 3.1.1 release.

Location:

branches/IDLDOC_3_1/idldoc

Files:

• Makefile (modified) (1 diff)
• src/idldoc_version.pro (modified) (1 diff)
• src/parser/docparprofileparser__define.pro (modified) (2 diffs)

branches/IDLDOC_3_1/idldoc/Makefile

@@ -1 @@
-VERSION=3.1.0
+VERSION=3.1.1
 REVISION=-r`svn info | sed -n 's/Revision: \(.*\)/\1/p'`
 IDL=idl

branches/IDLDOC_3_1/idldoc/src/idldoc_version.pro

@@ -13 +13 @@
   compile_opt strictarr
   
-  version = '3.1.0'
-  revision = '-r494'
+  version = '3.1.1'
+  revision = '-r498'
   
   return, version + (keyword_set(full) ? (' ' + revision) : '')

branches/IDLDOC_3_1/idldoc/src/parser/docparprofileparser__define.pro

@@ -324 +324 @@
     ; token delimiters are: space, tab, comma, and colon
     delims = ' ' + string(9B) + ',:'
-    tokens = strsplit(self->_stripComments(command), delims, /extract, count=nTokens)
+    cmd = self->_stripComments(command)
+    tokens = strsplit(cmd, delims, /extract, count=nTokens)
     if (nTokens eq 0) then begin
       if (justFinishedComment eq 2 && currentComments->count() gt 0) then begin
@@ -393 +394 @@
       file->addRoutine, routine
       
-      routine->setProperty, name=(strsplit(tokens[1], ',', /extract))[0]
+      ; if there is a routine header with a :: in it, then it's a method name
+      routineName = strpos(cmd, '::') eq -1 ? tokens[1] : strjoin(tokens[1:2], '::')
+      routine->setProperty, name=routineName
+      
       formatParser->checkForClass, routine
       if (strpos(tokens[1], '::') ne -1) then routine->setProperty, is_method=1B