demake 0.2.2 → 0.2.4

data/lib/data/libsrc/simple_linked_list.c

@@ -1,36 +1,56 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "base.h"
 #define SIMPLE_DOUBLE_LINKED_LIST
 #define SIMPLE_LINKED_LIST_IMPLEMENTATION
 #include "simple_linked_list.h"
 
 i32 main(i32 argc, c8 *argv[])
 {
-  struct simple_linked_list_s *head = NULL, *tail = NULL, *s = NULL;
+  struct simple_linked_list_data *head = NULL, *tail = NULL;
+  struct simple_linked_list_data *s1 = NULL, *s2;
   c8 *a = "a", *b = "b", *c = "c", *d = "d", *e = "e", *f = "f";
 
-  head = s = calloc(1, sizeof(struct simple_linked_list_s));
-  simple_linked_list_init(s, a);
-  tail = s = calloc(1, sizeof(struct simple_linked_list_s));
-  simple_linked_list_insert_after(head, s, b);
-  s = calloc(1, sizeof(struct simple_linked_list_s));
-  simple_linked_list_insert_after(tail, s, c);
-  tail = s;
-  s = calloc(1, sizeof(struct simple_linked_list_s));
-  simple_linked_list_insert_after(tail, s, f);
-  tail = s;
-  s = calloc(1, sizeof(struct simple_linked_list_s));
-  simple_linked_list_insert_before(tail, s, e);
-  tail = s;
-  s = calloc(1, sizeof(struct simple_linked_list_s));
-  simple_linked_list_insert_before(tail, s, d);
+  head = s1 = calloc(1, sizeof(struct simple_linked_list_data));
+  simple_linked_list_init(s1, a);
+  tail = s1 = calloc(1, sizeof(struct simple_linked_list_data));
+  simple_linked_list_insert_after(head, s1, b);
+  s1 = calloc(1, sizeof(struct simple_linked_list_data));
+  simple_linked_list_insert_after(tail, s1, c);
+  tail = s1;
+  s1 = calloc(1, sizeof(struct simple_linked_list_data));
+  simple_linked_list_insert_after(tail, s1, f);
+  tail = s1;
+  s2 = calloc(1, sizeof(struct simple_linked_list_data));
+  simple_linked_list_insert_before(tail, s2, e);
+  s1 = calloc(1, sizeof(struct simple_linked_list_data));
+  simple_linked_list_insert_before(s2, s1, d);
 
-  s = head;
-  while(s) {
-    if(s && s->value && s->value != NULL)
-      printf("%s\n", (u8 *)s->value);
-    s = s->next;
+  printf("head to tail:");
+  s1 = head;
+  while(s1) {
+    if(s1 && s1->value && s1->value != NULL)
+      printf(" %s", (c8 *)s1->value);
+    s1 = s1->next;
   }
+
+  printf("\ntail to head:");
+  s1 = tail;
+  while(s1) {
+    if(s1 && s1->value && s1->value != NULL)
+      printf(" %s", (c8 *)s1->value);
+    s1 = s1->previous;
+  }
+  printf("\n");
+
+  s1 = head;
+  while(s1) {
+    head = s1->next;
+    simple_linked_list_remove(s1);
+    free(s1);
+    s1 = head;
+  }
+  tail = head = s1 = s2 = NULL;
+
+  exit(0);
 }

data/lib/data/libsrc/simple_linked_list.h

@@ -8,84 +8,168 @@
 
   Public Functions:
 
+  static void simple_linked_list_init(struct simple_linked_list_data *s, void *value);
+
+  static void simple_linked_list_insert_after(struct simple_linked_list_data *position,
+      struct simple_linked_list_data *s, void *value);
+  static void simple_linked_list_insert_before(struct simple_linked_list_data *position,
+      struct simple_linked_list_data *s, void *value);
+
+  static void simple_linked_list_remove(struct simple_linked_list_data *s);
+
 */
 
 #ifndef SIMPLE_LINKED_LIST_H_Minaswan	/* Prevent multiple inclusions */
-#define SIMPLE_LINKED_LIST_H_Minaswan
-  #ifndef TYPEDEFS_H_Minaswan		/* Header guard for typedefs.h */
+  #define SIMPLE_LINKED_LIST_H_Minaswan
+  #ifndef TYPEDEFS_H_Minaswan     /* Prevents multiple inclusions */
     #define TYPEDEFS_H_Minaswan
+    #define TYPEDEFS_VERSION      "0.1.0"
+    #include <stdint.h>
 
-  #endif				/* TYPEDEFS_H_Minaswan */
+    typedef uint8_t b8;           /* Booleans                     */
+    typedef uint16_t b16;
+    typedef uint32_t b32;
+    typedef uint64_t b64;
 
-  struct simple_linked_list_s {
-    struct simple_linked_list_s *next;
-  #ifdef SIMPLE_DOUBLE_LINKED_LIST
-    struct simple_linked_list_s *previous;
-  #endif
-    void *value;
-  };
+    typedef char c8;              /* Characters                   */
+    typedef unsigned char uc8;
 
-  /* Public Functions */
+    typedef uint8_t u8;           /* Unsigned Numbers             */
+    typedef uint16_t u16;
+    typedef uint32_t u32;
+    typedef uint64_t u64;
 
-  #ifdef SIMPLE_LINKED_LIST_IMPLEMENTATION
-  void simple_linked_list_init(struct simple_linked_list_s *s, void *value)
-  {
-  #ifdef SIMPLE_DOUBLE_LINKED_LIST
-    s->previous = s->next = NULL;
-  #endif
-    s->value = value;
-  }
+    typedef int8_t i8;            /* Signed Numbers               */
+    typedef int16_t i16;
+    typedef int32_t i32;
+    typedef int64_t i64;
 
-  void simple_linked_list_insert_after(struct simple_linked_list_s *position,
-      struct simple_linked_list_s *s, void *value)
-  {
-    s->value = value;
-    s->next = position->next;
-  #ifdef SIMPLE_DOUBLE_LINKED_LIST
-    s->previous = position;
-    if(position->next != NULL)
-      position->next->previous = s;
-  #endif
-    position->next = s;
-  }
+    typedef float f32;            /* Floating Point Numbers       */
+    typedef double f64;
+  #endif                          /* TYPEDEFS_H_Minaswan          */
 
-  void simple_linked_list_insert_before(struct simple_linked_list_s *position,
-      struct simple_linked_list_s *s, void *value)
-  {
-    s->value = value;
-    s->next = position;
+  struct simple_linked_list_data {
+    void *value;
+    struct simple_linked_list_data *next;
   #ifdef SIMPLE_DOUBLE_LINKED_LIST
-    s->previous = position->previous;
-    if(position->previous != NULL)
-      position->previous->next = s;
-    position->previous = s;
+    struct simple_linked_list_data *previous;
   #endif
-  }
+  };
 
-#ifdef SIMPLE_DOUBLE_LINKED_LIST
-  void simple_linked_list_remove(struct simple_linked_list_s *s)
-  {
-    if(s->previous)
-      s->previous->next = s->next;
-    if(s->next)
-      s->next->previous = s->previous;
-    s->previous = s->next = NULL;
-  }
-#endif
+  /* Public Functions */
+  static void simple_linked_list_init(struct simple_linked_list_data *s, void *value);
+  static void simple_linked_list_insert_after(struct simple_linked_list_data *position,
+      struct simple_linked_list_data *s, void *value);
+  static void simple_linked_list_insert_before(struct simple_linked_list_data *position,
+      struct simple_linked_list_data *s, void *value);
+  static void simple_linked_list_remove(struct simple_linked_list_data *s);
 
+  #ifdef SIMPLE_LINKED_LIST_IMPLEMENTATION
+    static void simple_linked_list_init(struct simple_linked_list_data *s, void *value)
+    {
+    #ifdef SIMPLE_DOUBLE_LINKED_LIST
+      s->previous = s->next = NULL;
+    #endif
+      s->value = value;
+    }
+
+    static void simple_linked_list_insert_after(struct simple_linked_list_data *position,
+        struct simple_linked_list_data *s, void *value)
+    {
+      s->value = value;
+      s->next = position->next;
+    #ifdef SIMPLE_DOUBLE_LINKED_LIST
+      s->previous = position;
+      if(position->next != NULL)
+        position->next->previous = s;
+    #endif
+      position->next = s;
+    }
+
+    static void simple_linked_list_insert_before(struct simple_linked_list_data *position,
+        struct simple_linked_list_data *s, void *value)
+    {
+      s->value = value;
+      s->next = position;
+    #ifdef SIMPLE_DOUBLE_LINKED_LIST
+      s->previous = position->previous;
+      if(position->previous != NULL)
+        position->previous->next = s;
+      position->previous = s;
+    #endif
+    }
+
+    #ifdef SIMPLE_DOUBLE_LINKED_LIST
+    static void simple_linked_list_remove(struct simple_linked_list_data *s)
+    {
+      if(s->previous)
+        s->previous->next = s->next;
+      if(s->next)
+        s->next->previous = s->previous;
+      s->previous = s->next = NULL;
+    }
+    #endif
   #endif	/* SIMPLE_LINKED_LIST_IMPLEMENTATION */
 #endif		/* SIMPLE_LINKED_LIST_H_Minaswan */
 
 /*
   Example:
 
+  #include <stdio.h>
+  #include <stdlib.h>
+
+  #define SIMPLE_DOUBLE_LINKED_LIST
   #define SIMPLE_LINKED_LIST_IMPLEMENTATION
   #include "simple_linked_list.h"
 
-  struct simple_linked_list_s s;
-  c8 *a = "a", *b = "b", *c = "c";
-
-  simple_linked_list_init(&s, a);
-
+  i32 main(i32 argc, c8 *argv[])
+  {
+    struct simple_linked_list_data *head = NULL, *tail = NULL;
+    struct simple_linked_list_data *s1 = NULL, *s2;
+    c8 *a = "a", *b = "b", *c = "c", *d = "d", *e = "e", *f = "f";
+
+    head = s1 = calloc(1, sizeof(struct simple_linked_list_data));
+    simple_linked_list_init(s1, a);
+    tail = s1 = calloc(1, sizeof(struct simple_linked_list_data));
+    simple_linked_list_insert_after(head, s1, b);
+    s1 = calloc(1, sizeof(struct simple_linked_list_data));
+    simple_linked_list_insert_after(tail, s1, c);
+    tail = s1;
+    s1 = calloc(1, sizeof(struct simple_linked_list_data));
+    simple_linked_list_insert_after(tail, s1, f);
+    tail = s1;
+    s2 = calloc(1, sizeof(struct simple_linked_list_data));
+    simple_linked_list_insert_before(tail, s2, e);
+    s1 = calloc(1, sizeof(struct simple_linked_list_data));
+    simple_linked_list_insert_before(s2, s1, d);
+
+    printf("head to tail:");
+    s1 = head;
+    while(s1) {
+      if(s1 && s1->value && s1->value != NULL)
+        printf(" %s", (c8 *)s1->value);
+      s1 = s1->next;
+    }
+
+    printf("\ntail to head:");
+    s1 = tail;
+    while(s1) {
+      if(s1 && s1->value && s1->value != NULL)
+        printf(" %s", (c8 *)s1->value);
+      s1 = s1->previous;
+    }
+    printf("\n");
+
+    s1 = head;
+    while(s1) {
+      head = s1->next;
+      simple_linked_list_remove(s1);
+      free(s1);
+      s1 = head;
+    }
+    tail = head = s1 = s2 = NULL;
+
+    exit(0);
+  }
 
 */

data/lib/data/libsrc/typedefs.h

@@ -12,7 +12,7 @@
 
 #ifndef TYPEDEFS_H_Minaswan	/* Prevents multiple inclusions */
   #define TYPEDEFS_H_Minaswan
-  #define TYPEDEFS_VERSION	"0.1.0"
+  #define TYPEDEFS_VERSION	"0.1.1"
   #include <stdint.h>
 
   typedef uint8_t b8;		/* Booleans			*/
@@ -21,7 +21,9 @@
   typedef uint64_t b64;
 
   typedef char c8;		/* Characters			*/
+  typedef const char cc8;
   typedef unsigned char uc8;
+  typedef char as8;		/* Auto string			*/
 
   typedef uint8_t u8;		/* Unsigned Numbers		*/
   typedef uint16_t u16;
@@ -47,14 +49,14 @@ vim.api.nvim_create_autocmd("FileType", {
     group = "CustomCTypedefs",
     pattern = { "c", "h", "cpp", "hpp" },
     callback = function()
-        vim.cmd([[syntax match CustomTypedef /\<\(b8\|b16\|b32\|b64\|c8\|uc8\|i8\|i16\|i32\|i64\|u8\|u16\|u32\|u64\|f32\|f64\)\>/]])
+        vim.cmd([[syntax match CustomTypedef /\<\(b8\|b16\|b32\|b64\|c8\|cc8\|uc8\|as8\|i8\|i16\|i32\|i64\|u8\|u16\|u32\|u64\|f32\|f64\)\>/]])
         vim.cmd([[highlight CustomTypedef guifg=green ctermfg=green]])
     end,
 })
 
 For nano, add to /usr/share/nano/c.nanorc:
 
-color green "\<(b8|b16|b32|b64|c8|uc8|i8|i16|i32|i64|u8|u16|u32|u64|f32|f64)\>"
+color green "\<(b8|b16|b32|b64|c8|cc8|uc8|as8|i8|i16|i32|i64|u8|u16|u32|u64|f32|f64)\>"
 
 For emacs, it would seem the magic is strong, because it just works. :)
 

data/lib/to_plural.rb

@@ -0,0 +1,126 @@
+PLURALS_TABLE = {
+  "aircraft"    => "aircraft",
+  "analysis"    => "analyses",
+  "analytics"   => "analytics",
+  "appendix"    => "appendices",
+  "audio"       => "audio",
+  "bacterium"   => "bacteria",
+  "baggage"     => "baggage",
+  "basis"       => "bases",
+  "bison"       => "bison",
+  "buffalo"     => "buffalo",
+  "cactus"      => "cacti",
+  "child"       => "children",
+  "content"     => "content",
+  "corpus"      => "corpora",
+  "crisis"      => "crises",
+  "criterion"   => "criteria",
+  "currency"    => "currency",
+  "curriculum"  => "curricula",
+  "datum"       => "data",
+  "deer"        => "deer",
+  "diagnosis"   => "diagnoses",
+  "die"         => "dice",
+  "elk"         => "elk",
+  "ellipsis"    => "ellipses",
+  "equipment"   => "equipment",
+  "feedback"    => "feedback",
+  "firmware"    => "firmware",
+  "fish"        => "fish",
+  "focus"       => "foci",
+  "foot"        => "feet",
+  "fungus"      => "fungi",
+  "furniture"   => "furniture",
+  "garbage"     => "garbage",
+  "genus"       => "genera",
+  "goose"       => "geese",
+  "hardware"    => "hardware",
+  "hovercraft"  => "hovercraft",
+  "hypothesis"  => "hypotheses",
+  "index"       => "indices",
+  "information" => "information",
+  "jeans"       => "jeans",
+  "knowledge"   => "knowledge",
+  "louse"       => "lice",
+  "luggage"     => "luggage",
+  "man"         => "men",
+  "marketing"   => "marketing",
+  "matrix"      => "matrices",
+  "medium"      => "media",
+  "memorandum"  => "memoranda",
+  "metadata"    => "metadata",
+  "middleware"  => "middleware",
+  "money"       => "money",
+  "moose"       => "moose",
+  "mouse"       => "mice",
+  "music"       => "music",
+  "neurosis"    => "neuroses",
+  "news"        => "news",
+  "nucleus"     => "nuclei",
+  "oasis"       => "oases",
+  "octopus"     => "octopi",
+  "offspring"   => "offspring",
+  "ox"          => "oxen",
+  "pants"       => "pants",
+  "paralysis"   => "paralyses",
+  "parenthesis" => "parentheses",
+  "person"      => "people",
+  "phenomenon"  => "phenomena",
+  "police"      => "police",
+  "progress"    => "progress",
+  "research"    => "research",
+  "rice"        => "rice",
+  "rubbish"     => "rubbish",
+  "salmon"      => "salmon",
+  "scissors"    => "scissors",
+  "series"      => "series",
+  "sheep"       => "sheep",
+  "software"    => "software",
+  "spacecraft"  => "spacecraft",
+  "species"     => "species",
+  "spokesman"   => "spokesmen",
+  "spokeswoman" => "spokeswomen",
+  "squid"       => "squid",
+  "staff"       => "staff",
+  "stimulus"    => "stimuli",
+  "stratum"     => "strata",
+  "swine"       => "swine",
+  "syllabus"    => "syllabi",
+  "synopsis"    => "synopses",
+  "thesis"      => "theses",
+  "tooth"       => "teeth",
+  "traffic"     => "traffic",
+  "trousers"    => "trousers",
+  "trout"       => "trout",
+  "vortex"      => "vortices",
+  "watercraft"  => "watercraft",
+  "woman"       => "women",
+  "zombie"      => "zombies"
+}.freeze
+
+def pluralize(word)
+  if(word.empty?)
+    return word
+  end
+  word = word.to_s.dup
+  pattern_replacement = Array.new
+  pattern_replacement << [/([^aeiou])y$/i, '\1ies']
+  pattern_replacement << [/(ch|sh|x|s|z)$/i, '\1es']
+  pattern_replacement << [/fe$/i, 'ves']
+  pattern_replacement << [/([^f])f$/i, '\1ves']
+  pattern_replacement << [/$/, 's']
+  pattern_replacement.each do |pattern, replacement|
+    if(word.gsub!(pattern, replacement))
+      break
+    end
+  end
+  return word
+end
+
+def to_plural(word)
+  key = word.to_s.downcase
+  if(PLURALS_TABLE.key?(key))
+    return PLURALS_TABLE[key]
+  end
+  return pluralize(word)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: demake
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Minaswan Nakamoto
@@ -30,12 +30,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 description: |
-  == Develop, Decorate and manage Dependencies for C (GNU) Makefiles easily with a Ruby script.
+  == Develop, Decorate and manage Dependencies for C (GNU) Makefiles easily with Ruby.
 
     Install using the Ruby Gem:
 
     > gem install demake
 
+    To see command syntax:
+
+    > demake ?
+
+      Command syntax:
+
+      demake               - Create or update Makefile
+      demake ?             - View this help information
+      demake new <name>    - Create new application
+      demake example       - Create an example application
+      demake oreo          - Create a different sample application
+
+    To create a new application:
+
+    > demake new <name>
+
+    This will create a new directory and basic files for a new C application.
+
+    To create or update a GNU Makefile on an existing demake application,
+    execute without arguments:
+
+    > demake
+
     To create an example with multiple sample applications:
 
     > demake example
@@ -48,9 +71,10 @@ description: |
 
     This will create a directory named oreo containing the example.
 
-    It requires a demake directory and application file containing the application
-    names followed by depencencies separated by spaces and with a new line to indicate
-    a different application. Something like (from the example):
+    It requires a demake directory and application file containing the
+    application names followed by depencencies separated by spaces and
+    with a new line to indicate a different application.
+    Something like (from the example):
 
     > mkdir demake
     > echo "hello string" > demake/applications
@@ -61,10 +85,6 @@ description: |
     demake/settings.rb, demake/test-target.rb, demake/install-target.rb,
     demake/license
 
-    The output of the command by itself is a (GNU style) file named Makefile:
-
-    > demake
-
     You can also clone from git:
 
     > git clone https://github.com/MinaswanNakamoto/demake.git
@@ -73,8 +93,8 @@ description: |
     > bin/demake example
     > cd example ; make ; make build ; make test
 
-    If you have an existing C application and you want to generate a Makefile for it,
-    you might try the gen_application shell script.
+    If you have an existing C application and you want to generate a Makefile
+    for it, you might try the gen_application shell script.
 
     > ./gen_application myapp
 email: minaswan.nakamoto@onionmail.org
@@ -86,11 +106,14 @@ files:
 - bin/demake
 - lib/apps/example/Makefile
 - lib/apps/example/demake/applications
+- lib/apps/example/demake/auto_bits.rb
+- lib/apps/example/demake/auto_list.rb
 - lib/apps/example/demake/brief_description
 - lib/apps/example/demake/license
 - lib/apps/example/demake/settings.rb
 - lib/apps/example/demake/suggestion
 - lib/apps/example/demake/test-target.rb
+- lib/apps/example/src/Makefile
 - lib/apps/example/src/goodbye.c
 - lib/apps/example/src/hello.c
 - lib/apps/example/src/string/string.c
@@ -103,22 +126,30 @@ files:
 - lib/apps/oreo/demake/suggestion
 - lib/apps/oreo/demake/test-target.rb
 - lib/apps/oreo/oreo_test.txt
+- lib/apps/oreo/src/Makefile
 - lib/apps/oreo/src/defines.h
 - lib/apps/oreo/src/fast_read_file.h
 - lib/apps/oreo/src/oreo.c
 - lib/apps/oreo/src/typedefs.h
+- lib/data/libsrc/auto_bits.c
 - lib/data/libsrc/auto_bits.h
+- lib/data/libsrc/auto_bits.rb
+- lib/data/libsrc/auto_list.rb
+- lib/data/libsrc/auto_string.c
+- lib/data/libsrc/auto_string.h
+- lib/data/libsrc/auto_string_clamp_test.c
 - lib/data/libsrc/base.h
 - lib/data/libsrc/cpu_mark_check.h
 - lib/data/libsrc/defines.h
 - lib/data/libsrc/fast_read_file.h
 - lib/data/libsrc/fast_sha2.h
+- lib/data/libsrc/memory_arena.c
+- lib/data/libsrc/memory_arena.h
+- lib/data/libsrc/memory_arena_test.c
 - lib/data/libsrc/parse_arguments.h
 - lib/data/libsrc/rb_library.c
-- lib/data/libsrc/simple_linked_list
 - lib/data/libsrc/simple_linked_list.c
 - lib/data/libsrc/simple_linked_list.h
-- lib/data/libsrc/smart_alloc.h
 - lib/data/libsrc/typedefs.h
 - lib/template/build_target.rb
 - lib/template/clean_target.rb
@@ -134,6 +165,7 @@ files:
 - lib/template/license_target.rb
 - lib/template/link_library_target.rb
 - lib/template/strip_build.rb
+- lib/to_plural.rb
 homepage: https://github.com/MinaswanNakamoto/demake
 licenses:
 - MIT
@@ -152,8 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.15
 specification_version: 4
 summary: Develop, Decorate and manage Dependencies for C (GNU) Makefiles easily with
-  a Ruby script.
+  Ruby.
 test_files: []

data/lib/data/libsrc/smart_alloc.h

@@ -1,45 +0,0 @@
-/*
-
-  smart_alloc.h -- *Full Library* Header File
-
-  For smart alloc
-
-  See the end of this file for an example.
-
-  Public Functions:
-
-*/
-
-#ifndef SMART_ALLOC_H_Minaswan		/* Prevent multiple inclusions */
-#define SMART_ALLOC_H_Minaswan
-  #ifndef TYPEDEFS_H_Minaswan		/* Header guard for typedefs.h */
-    #define TYPEDEFS_H_Minaswan
-
-  #endif				/* TYPEDEFS_H_Minaswan */
-
-  struct smart_alloc_data_s {
-    struct smart_alloc_data_s *next;
-  };
-
-  struct smart_alloc_s {
-  };
-
-  /* Public Functions */
-
-  #ifdef SMART_ALLOC_IMPLEMENTATION
-
-  #endif	/* SMART_ALLOC_IMPLEMENTATION */
-#endif		/* SMART_ALLOC_H_Minaswan */
-
-/*
-  Example:
-
-  #define SMART_ALLOC_IMPLEMENTATION
-  #include "smart_alloc.h"
-
-  i32 arena = smart_alloc_create(0);
-
-  smart_alloc(arena, size, align)
-
-
-*/