diff --git a/morphisms/Makefile b/morphisms/Makefile index 2394a86..3912ac9 100644 --- a/morphisms/Makefile +++ b/morphisms/Makefile @@ -1,13 +1,13 @@ LIB_DIR=$(shell pwd)/lib -TARGETS=lib/libmorph_length_prefix.so lib/libmorph_posint.so test +TARGETS=lib/libmorph_length-prefix.so lib/libmorph_posint.so test all: $(TARGETS) lib/libmorph_%.so: src/%.c $(CC) -O3 -shared -o $@ -fPIC -Iinclude $< -test: test.c lib/libmorph_length_prefix.so lib/libmorph_posint.so - $(CC) -O3 -L$(LIB_DIR) -o $@ -Iinclude $< -llength_prefix -lposint +test: test.c lib/libmorph_length-prefix.so lib/libmorph_posint.so + $(CC) -O3 -L$(LIB_DIR) -o $@ -Iinclude $< -lmorph_length-prefix -lmorph_posint clean: rm $(TARGETS) diff --git a/morphisms/include/morphisms/length_prefix.h b/morphisms/include/morphisms/length-prefix.h similarity index 100% rename from morphisms/include/morphisms/length_prefix.h rename to morphisms/include/morphisms/length-prefix.h diff --git a/morphisms/include/morphisms/posint.h b/morphisms/include/morphisms/posint.h index 08568a6..d44db28 100644 --- a/morphisms/include/morphisms/posint.h +++ b/morphisms/include/morphisms/posint.h @@ -1,6 +1,6 @@ #pragma once #include <stdint.h> -#include <morphisms/length_prefix.h> +#include <morphisms/length-prefix.h> int morph_digit_as_char_to_uint8( char const * restrict src, diff --git a/morphisms/morphism-base/length_prefix.morphism-base b/morphisms/morphism-base/length_prefix.morphism-base index 7a74e26..a8c13be 100644 --- a/morphisms/morphism-base/length_prefix.morphism-base +++ b/morphisms/morphism-base/length_prefix.morphism-base @@ -1,9 +1,9 @@ morph_string_as_nullterm_to_length_prefix () [~<ValueDelim '\0'> Char ~ Ascii] --> [~<LengthPrefix x86.UInt64> Char ~ Ascii] -@lib/array.so:src/array.c +@lib/libmorph_length-prefix.so:src/length_prefix.c morph_string_as_length_prefix_to_nullterm () [~<LengthPrefix x86.UInt64> Char ~ Ascii] --> [~<ValueDelim '\0'> Char ~ Ascii] -@lib/array.so:src/array.c +@lib/libmorph_length-prefix.so:src/length_prefix.c diff --git a/morphisms/morphism-base/posint.morphism-base b/morphisms/morphism-base/posint.morphism-base index 417618c..af1e3f1 100644 --- a/morphisms/morphism-base/posint.morphism-base +++ b/morphisms/morphism-base/posint.morphism-base @@ -1,12 +1,12 @@ morph_digit_as_char_to_uint8 (Radix:ℤ_16) <Digit Radix> ~ Char ~ Ascii ~ Byte --> <Digit Radix> ~ x86.UInt8 ~ Byte -@lib/posint.so:src/posint.c +@lib/libmorph-posint.so:src/posint.c morph_digit_as_uint8_to_char (Radix:ℤ_16) <Digit Radix> ~ x86.UInt8 ~ Byte --> <Digit Radix> ~ Char ~ Ascii ~ Byte -@lib/posint.so:src/posint.c +@lib/libmorph-posint.so:src/posint.c morph_posint_radix (SrcRadix:ℤ, DstRadix:ℤ) ℕ @@ -15,7 +15,7 @@ morph_posint_radix (SrcRadix:ℤ, DstRadix:ℤ) --> ℕ ~ <PosInt DstRadix LittleEndian> ~ [~<LengthPrefix x86.UInt64> <Digit DstRadix>~x86.UInt64] -@lib/posint.so:src/posint.c +@lib/libmorph-posint.so:src/posint.c morph_posint_endianness (Radix:ℤ) ℕ @@ -24,7 +24,7 @@ morph_posint_endianness (Radix:ℤ) --> ℕ ~ <PosInt Radix BigEndian> ~ [~<LengthPrefix x86.UInt64> <Digit Radix> ~ x86.UInt64] -@lib/posint.so:src/posint.c +@lib/libmorph-posint.so:src/posint.c morph_posint_endianness (Radix:ℤ) ℕ @@ -33,4 +33,4 @@ morph_posint_endianness (Radix:ℤ) --> ℕ ~ <PosInt Radix LittleEndian> ~ [~<LengthPrefix x86.UInt64> <Digit Radix> ~ x86.UInt64] -@lib/posint.so:src/posint.c +@lib/libmorph-posint.so:src/posint.c diff --git a/morphisms/src/length_prefix.c b/morphisms/src/length-prefix.c similarity index 98% rename from morphisms/src/length_prefix.c rename to morphisms/src/length-prefix.c index cd29532..12f6234 100644 --- a/morphisms/src/length_prefix.c +++ b/morphisms/src/length-prefix.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdint.h> -#include <morphisms/length_prefix.h> +#include <morphisms/length-prefix.h> void length_prefix_uint64_array_clear( struct LengthPrefixUInt64Array * data diff --git a/morphisms/src/posint.c b/morphisms/src/posint.c index cc35955..65292a9 100644 --- a/morphisms/src/posint.c +++ b/morphisms/src/posint.c @@ -1,5 +1,5 @@ #include <stdint.h> -#include <morphisms/length_prefix.h> +#include <morphisms/length-prefix.h> int morph_digit_as_char_to_uint8( char const * restrict src, diff --git a/morphisms/test.c b/morphisms/test.c index 8fe26b7..7439ab1 100644 --- a/morphisms/test.c +++ b/morphisms/test.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <morphisms/length_prefix.h> +#include <morphisms/length-prefix.h> #include <morphisms/posint.h> int main( int argc, char * argv[] ) {