Add Basic InnoSetup-Script support [from Sven Strickroth (MrTux)]

  - See https://sourceforge.net/p/sloccount/patches/11/

4 files changed, 84 insertions, 2 deletions

diff --git a/break_filelist b/break_filelist
index 154e3b4..04fda72 100755
--- a/break_filelist
+++ b/break_filelist
@@ -212,7 +212,7 @@ $noisy = 0;            # Set to 1 if you want noisy reports.
   "ahk" => "autohotkey",
   "au3" => "autoit",
   "bat" => "batch", "cmd" => "batch",
-  # Add more files here
+  "iss" => "innosetup",
 );
 
 
diff --git a/innosetup_count b/innosetup_count
new file mode 100644
index 0000000..ad0ebb4
--- /dev/null
+++ b/innosetup_count
@@ -0,0 +1,80 @@
+#!/usr/bin/perl
+# innosetup_count - count physical lines of code, of InnoSetupScripts
+# Usage: innosetup_count [-f file] [list_of_files]
+#  file: file with a list of files to count (if "-", read list from stdin)
+#  list_of_files: list of files to count
+#  -f file or list_of_files can be used, or both
+
+
+# This is part of SLOCCount, a toolsuite that counts
+# source lines of code (SLOC).
+# Copyright (C) 2001-2004 David A. Wheeler.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# 
+# To contact David A. Wheeler, see his website at:
+#  http://www.dwheeler.com.
+# 
+# 
+
+$total_sloc = 0;
+
+# Do we have "-f" (read list of files from second argument)?
+if (($#ARGV >= 1) && ($ARGV[0] eq "-f")) {
+  # Yes, we have -f
+  if ($ARGV[1] eq "-") {
+    # The list of files is in STDIN
+    while (<STDIN>) {
+      chomp ($_);
+      &count_file ($_);
+    }
+  } else {
+    # The list of files is in the file $ARGV[1]
+    open (FILEWITHLIST, $ARGV[1]) || die "Error: Could not open $filewithlist\n";
+    while (<FILEWITHLIST>) {
+      chomp ($_);
+      &count_file ($_);
+    }
+    close FILEWITHLIST;
+  }
+  shift @ARGV; shift @ARGV;
+}
+# Process all (remaining) arguments as file names
+while ($file = shift @ARGV) {
+  &count_file ($file);
+}
+
+print "Total:\n";
+print "$total_sloc\n";
+
+sub count_file {
+  my ($file) = @_;
+  my $sloc = 0;
+
+  open (FILE, $file);
+  while (<FILE>) {
+    if ($begincodesection == 0) {
+        s/;.*//;
+        if (m/\S/) { $sloc++; }
+        if (m/^\[Code\]/i) { $begincodesection = 1; }
+    } else {
+        s/\/\/.*//;
+        if (m/\S/) { $sloc++; }
+    }
+  }
+  print "$sloc $file\n";
+  $total_sloc += $sloc;
+  close (FILE);
+}
diff --git a/makefile b/makefile
index 7646787..9673db7 100644
--- a/makefile
+++ b/makefile
@@ -105,6 +105,7 @@ EXECUTABLES= \
    get_sloc \
    get_sloc_details \
    haskell_count \
+   innosetup_count \
    javascript_count \
    lex_count \
    lisp_count \
diff --git a/makefile.orig b/makefile.orig
index 087d47d..7646787 100644
--- a/makefile.orig
+++ b/makefile.orig
@@ -90,7 +90,7 @@ EXECUTABLES= \
    awk_count \
    autohotkey_count \
    autoit_count \
-   vbasic_count \
+   batch_count \
    break_filelist \
    cobol_count \
    compute_all \
@@ -122,6 +122,7 @@ EXECUTABLES= \
    sloccount \
    sql_count \
    tcl_count \
+   vbasic_count \
    vbscript_count \
    $(COMPILED_EXECUTABLES)