Merge pull request #34 from Knaldgas/Ada-support

Added support for Ada code.

Author: dlidstrom

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.15.5)
 project(duplo)
 file(GLOB SOURCES src/*.cpp)
 
-SET(DUPLO_VERSION "\"v1.0.0\"" CACHE STRING "Duplo version")
+SET(DUPLO_VERSION "\"v1.0.1\"" CACHE STRING "Duplo version")
 
 if(MSVC)
 else()

Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.11 AS build
-ARG DUPLO_VERSION=v1.0.0
+ARG DUPLO_VERSION=v1.0.1
 
 RUN apk --no-cache add \
     alpine-sdk cmake

compile.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # to run this, first set the DUPLO_VERSION environment variable. Otherwise
 # some of the tests might fail. So, do this:
-# > export DUPLO_VERSION=v1.0.0
+# > export DUPLO_VERSION=v1.0.1
 p() {
     now="$(date +'%r')"
     printf "$(tput setaf 1)%s$(tput sgr0) | $(tput bold)$1$(tput sgr0)\n" "$now";

src/FileTypeFactory.cpp

@@ -4,6 +4,7 @@
 #include "FileType_S.h"
 #include "FileType_Unknown.h"
 #include "FileType_VB.h"
+#include "FileType_Ada.h"
 #include "StringUtil.h"
 
 #include <algorithm>
@@ -23,6 +24,8 @@ IFileTypePtr FileTypeFactory::CreateFileType(
         fileType.reset(new FileType_S(ignorePrepStuff, minChars));
     else if (ext == "vb")
         fileType.reset(new FileType_VB(ignorePrepStuff, minChars));
+    else if (ext == "ads" || ext == "adb")
+        fileType.reset(new FileType_Ada(ignorePrepStuff, minChars));
     else
         fileType.reset(new FileType_Unknown(minChars));
     return fileType;

src/FileType_Ada.cpp

@@ -0,0 +1,35 @@
+#include "FileType_Ada.h"
+#include "CstyleUtils.h"
+#include "NoopLineFilter.h"
+#include "SourceLine.h"
+
+#include <cstring>
+
+FileType_Ada::FileType_Ada(bool ignorePrepStuff, unsigned minChars)
+    : FileTypeBase(ignorePrepStuff, minChars) {
+}
+
+ILineFilterPtr FileType_Ada::CreateLineFilter() const {
+    return std::make_shared<NoopLineFilter>();
+}
+
+std::string FileType_Ada::GetCleanLine(const std::string& line) const {
+    std::string cleanedLine(line.substr(0, line.find("--")));
+    return cleanedLine;
+}
+
+bool FileType_Ada::IsPreprocessorDirective(const std::string& line) const {
+    // look for other markers to avoid
+    const char* markers[] = { "pragma", "with", "use" };
+
+    size_t first = line.find_first_not_of(" \t\r\n");
+    if (first != std::string::npos)
+	    first = 0;
+
+    for (auto v : markers) {
+        if (line.find(v, first, std::strlen(v)) != std::string::npos)
+            return true;
+    }
+
+    return false;
+}

src/FileType_Ada.h

@@ -0,0 +1,16 @@
+#ifndef _FILETYPE_ADA_H_
+#define _FILETYPE_ADA_H_
+
+#include "FileTypeBase.h"
+
+struct FileType_Ada : public FileTypeBase {
+    FileType_Ada(bool ignorePrepStuff, unsigned minChars);
+
+    ILineFilterPtr CreateLineFilter() const override;
+
+    std::string GetCleanLine(const std::string& line) const override;
+
+    bool IsPreprocessorDirective(const std::string& line) const override;
+};
+
+#endif

src/Main.cpp

@@ -51,7 +51,7 @@ namespace {
 
             std::cout << "\nDESCRIPTION\n";
             std::cout << "       Duplo is a tool to find duplicated code blocks in large\n";
-            std::cout << "       C/C++/Java/C#/VB.Net software systems.\n\n";
+            std::cout << "       C/C++/Java/C#/VB.Net/Ada software systems.\n\n";
 
             std::cout << "       -ml              minimal block size in lines (default is " << MIN_BLOCK_SIZE << ")\n";
             std::cout << "       -pt              percentage of lines of duplication threshold to override -ml\n";

tests/Simple_Ada/simple_log.adb

@@ -0,0 +1,49 @@
+with Ada.Text_IO;
+
+package body Simple_Log is
+
+   use Ada.Text_IO;
+
+   --
+   Current_Output_Level : Output_Level_Type := Info;
+
+   --
+   procedure Set_Output (New_Output_Level : in Output_Level_Type) is
+   begin
+      Current_Output_Level := New_Output_Level;
+   end Set_Output;
+
+   --
+   procedure Error (Message : in String) is
+   begin
+      if Current_Output_Level >= Error then
+         Put_Line (Standard_Error, Message);  --  For errors
+         --  Comments should be ignored, also as lines in between
+      end if;
+   end Error;
+
+   --
+   procedure Warning (Message : in String) is
+   begin
+      if Current_Output_Level >= Warning then
+         Put_Line (Standard_Error, Message);  --  For warnings
+      end if;
+   end Warning;
+
+   --
+   procedure Info (Message : in String) is
+   begin
+      if Current_Output_Level >= Info then
+         Put_Line (Standard_Error, Message);  --  For info
+      end if;
+   end Info;
+
+   --
+   procedure Debug (Message : in String) is
+   begin
+      if Current_Output_Level >= Debug then
+         Put_Line (Standard_Error, Message);  --  For debug
+      end if;
+   end Debug;
+
+end Simple_Log;

tests/Simple_Ada/simple_log.lst

@@ -0,0 +1 @@
+tests/Simple_Ada/simple_log.adb

tests/Simple_Ada/tests.bats

@@ -0,0 +1,38 @@
+setup() {
+    run ./build/duplo -ml 2 tests/Simple_Ada/simple_log.lst out.txt
+}
+
+@test "simple_log.adb" {
+    [ "$status" -eq 0 ]
+    [ "${lines[0]}" = "Loading and hashing files ... 2 done." ]
+    [ "${lines[1]}" = "tests/Simple_Ada/simple_log.adb found: 6 block(s)" ]
+}
+
+@test "simple_log.adb out.txt" {
+    run cat out.txt
+    printf 'Lines:\n'
+    printf 'lines %s\n' "${lines[@]}" >&2
+    printf 'output %s\n' "${output[@]}" >&2
+    [ "${lines[0]}" = "tests/Simple_Ada/simple_log.adb(29)" ]
+    [ "${lines[1]}" = "tests/Simple_Ada/simple_log.adb(20)" ]
+    [ "${lines[4]}" = "tests/Simple_Ada/simple_log.adb(37)" ]
+    [ "${lines[5]}" = "tests/Simple_Ada/simple_log.adb(29)" ]
+    [ "${lines[8]}" = "tests/Simple_Ada/simple_log.adb(45)" ]
+    [ "${lines[9]}" = "tests/Simple_Ada/simple_log.adb(37)" ]
+    [ "${lines[12]}" = "tests/Simple_Ada/simple_log.adb(37)" ]
+    [ "${lines[13]}" = "tests/Simple_Ada/simple_log.adb(20)" ]
+    [ "${lines[16]}" = "tests/Simple_Ada/simple_log.adb(45)" ]
+    [ "${lines[17]}" = "tests/Simple_Ada/simple_log.adb(29)" ]
+    [ "${lines[20]}" = "tests/Simple_Ada/simple_log.adb(45)" ]
+    [ "${lines[21]}" = "tests/Simple_Ada/simple_log.adb(20)" ]
+    [ "${lines[24]}" = "Configuration:" ]
+    [ "${lines[25]}" = "  Number of files: 1" ]
+    [ "${lines[26]}" = "  Minimal block size: 2" ]
+    [ "${lines[27]}" = "  Minimal characters in line: 3" ]
+    [ "${lines[28]}" = "  Ignore preprocessor directives: 0" ]
+    [ "${lines[29]}" = "  Ignore same filenames: 0" ]
+    [ "${lines[30]}" = "Results:" ]
+    [ "${lines[31]}" = "  Lines of code: 33" ]
+    [ "${lines[32]}" = "  Duplicate lines of code: 12" ]
+    [ "${lines[33]}" = "  Total 6 duplicate block(s) found." ]
+}