diff --git a/README.md b/README.md index d257295..4f92b6a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # src-ed -Source code samples for various languages - hello "name-your-language" world! +Source code samples for various languages - hello name-your-language world! + -The subdirectory "misc-tools" contains miscellaneous utilities that may -be of interest or help to a programmer. diff --git a/forth/hello.fs b/forth/hello.fs deleted file mode 100755 index e8408dc..0000000 --- a/forth/hello.fs +++ /dev/null @@ -1,33 +0,0 @@ -#! /usr/bin/gforth -\ -\ Sample Hello World! Forth script... -\ - -\ Define "verinfo" -: verinfo s" git describe --abbrev=7 --dirty --always --tags" system ; - -\ Define "printargs" -: printargs - \ The argc variable contains the count of cmd line args - \ in gforth, so we put it's value (@) on the stack plus - \ the number one and test if the value is greater than one. - argc @ 1 > if - \ condition is true, so put the value of argc (@) - \ on the stack and the value one as the range of - \ our do loop - we don't pring arg 0 which is the - \ name of the program. - argc @ 1 do i arg type space loop cr - else - \ condition is false, so don't print anything - cr - then ; - - -\ Obligatory Hello World with some version info -.( Hello Forth World! Version: ) verinfo cr - - -\ Show list of command line arguments -.( Command line args: ) printargs - -bye diff --git a/misc-tools/what b/misc-tools/what deleted file mode 100755 index 61d4528..0000000 --- a/misc-tools/what +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# what - get SCCS identification information -# -# SCCS was the source code control system distributed -# with AT&T Unix System III and V. -# -for i in "$@"; -do - echo "$i:" - strings "$i" | grep -e '@(#)' | sed 's/^.*[@][(][#][)]\(.*\)/ \1/' -done diff --git a/openmp-c/Makefile b/openmp-c/Makefile index c20d9d6..3c1031b 100644 --- a/openmp-c/Makefile +++ b/openmp-c/Makefile @@ -1,24 +1,17 @@ # Sample makefile to add version/compiler info via an extra # object module linked to final binary. # -CC=gcc -COMPILER_VER:=$(shell $(CC) --version) -CFLAGS=-fopenmp -LDFLAGS= +COMPILER_VER:=$(shell gcc --version) +COMPILER_OPTS=-fopenmp GIT_DESCRIBE:=$(shell git describe --abbrev=7 --dirty --always --tags --long) -GIT_AUTHOR:=$(shell git --no-pager log -1 --pretty=format:"%an <%ae>") -BUILD_DATE:=$(shell date +"%F %H:%M:%S") .PHONY: all all: hello-omp versioninfo.txt: - @echo "@(#) Build date: ${BUILD_DATE}." >versioninfo.txt - @echo "@(#) Compiler version: ${COMPILER_VER}." >>versioninfo.txt - @echo "@(#) Compiler options: '${CFLAGS}'." >>versioninfo.txt - @echo "@(#) Linker options: '${LDFLAGS}'." >>versioninfo.txt + @echo "@(#) Compiler version: ${COMPILER_VER}." >versioninfo.txt + @echo "@(#) Compiler options: ${COMPILER_OPTS}." >>versioninfo.txt @echo "@(#) Git info: ${GIT_DESCRIBE}" >>versioninfo.txt - @echo "@(#) Commit author: ${GIT_AUTHOR}" >>versioninfo.txt versioninfo.o: versioninfo.txt objcopy --input binary \ @@ -29,8 +22,8 @@ versioninfo.o: versioninfo.txt versioninfo.txt versioninfo.o hello-omp: hello-omp.c Makefile versioninfo.o - gcc $(CFLAGS) $(LDFLAGS) -DVERSIONINFO="\"$(GIT_DESCRIBE)\"" \ - hello-omp.c versioninfo.o -o hello-omp + gcc $(COMPILER_OPTS) -DVERSIONINFO="\"$(GIT_DESCRIBE)\"" hello-omp.c \ + versioninfo.o -o hello-omp .PHONY: test test: diff --git a/perl/hello.pl b/perl/hello.pl index 9c17e64..a45cf03 100755 --- a/perl/hello.pl +++ b/perl/hello.pl @@ -14,15 +14,10 @@ my $verinfo = `git describe --abbrev=7 --dirty --always --tags`; print "Hello Perl World! Version: $verinfo\n"; # Show list of command line arguments -print "Command line args: "; -foreach (@ARGV) { - print " $_"; -} -print "\n"; - -# Determine number of physical CPU sockets -my $socketcount=`cat /proc/cpuinfo | grep 'physical id' | sort | uniq | wc -l`; -print "CPU socket count: $socketcount\n"; +print "Command line args: @ARGV\n"; +print "ARGV[0] = $ARGV[0]"; +print "ARGV[1] = $ARGV[1]"; +print "ARGV[2] = $ARGV[2]"; # print out our animals array in reverse-sorted order print "\nValue of animals array:\n"; @@ -41,27 +36,6 @@ foreach (keys %fruit_color) { print "$_ = $fruit_color{$_}\n"; } -# Read a non-existent environment variable and supply default value... -my $some_env_var; -if (defined $ENV{'PROBABLY_NOT_THERE'}) { - $some_env_var = $ENV{'PROBABLY_NOT_THERE'}; -} else { - $some_env_var = "Default value"; -} -print "\nPROBABLY_NOT_THERE is set to \'$some_env_var\'\n\n"; - -# Let's read in the PATH variable from the OS and print it out... -my $path_env_var = $ENV{'PATH'}; -print "OS PATH var is set to: \'$path_env_var\'\n\n"; - -# Let's manipulate PATH variable and then restore it -print "Adding :/test to PATH variable\n"; -$ENV{'PATH'} = "$ENV{'PATH'}:/test"; -print "OS PATH var is set to: \'$ENV{'PATH'}\'\n\n"; -print "Restoring original PATH value.\n"; -$ENV{'PATH'} = $path_env_var; -print "OS PATH var is set to: \'$path_env_var\'\n\n"; - # Let's create the file test.out and write animals array to it... print "\nWriting test.out file...\n"; open(my $out, ">", "test.out") or die "Can't create/open test.out! $!\n"; diff --git a/python/hello.py b/python/hello.py index ed21fed..154d35f 100755 --- a/python/hello.py +++ b/python/hello.py @@ -15,13 +15,13 @@ verinfo = subprocess.check_output(["git", "describe", "--abbrev=7", "--dirty", "--always", "--tags"]) # Obligatory Hello World with some version info -print("Hello Python World! Version: {}".format(verinfo)) +print "Hello Python World! Version: " +verinfo # Show list of command line arguments -print("Command line args: "), +print "Command line args: ", for i in sys.argv[1:]: - print(" {}".format(i)) -print("") + print " " + i, +print "" # Determine number of physical CPU sockets if os.name == 'nt': @@ -29,52 +29,52 @@ if os.name == 'nt': else: socketcount = subprocess.check_output(["bash","-c", "(cat /proc/cpuinfo | grep 'physical id' | sort | uniq | wc -l)"]) - print("CPU socket count: {}".format(socketcount)) + print "CPU socket count: ", socketcount # print out our animals array in reverse-sorted order -print("\nValue of animals array:") +print "\nValue of animals array:" for i in sorted(animals, reverse=True): - print("item = " + i) + print "item = " + i if (i == animals[0]): - print(" Condition is TRUE, \"" +i+ "\" == " + animals[0]) + print " Condition is TRUE, \"" +i+ "\" == " + animals[0] else: - print(" Condition is FALSE, \"" +i+ "\" != " + animals[0]) + print " Condition is FALSE, \"" +i+ "\" != " + animals[0] # print our fruit_color dictionary (key/value pairs) -print("\nValue of fruit_color hash:") +print "\nValue of fruit_color hash:" for fruit,color in sorted(fruit_color.items(), reverse=True): - print(fruit, " = ", color) + print fruit, " = ", color # Read a non-existent environment variable and supply default value... some_env_var = os.getenv("PROBABLY_NOT_THERE", "Default Value") -print("\nPROBABLY_NOT_THERE is set to '"+some_env_var+"'\n") +print "\nPROBABLY_NOT_THERE is set to '"+some_env_var+"'\n" # Let's read in the PATH variable from the OS and print it out... path_env_var = os.environ['PATH'] -print("OS PATH var is set to: '"+path_env_var+"'\n") +print "OS PATH var is set to: '"+path_env_var+"'\n" # Let's manipulate PATH variable and then restore it -print("Adding :/test to PATH variable") +print "Adding :/test to PATH variable" os.environ['PATH'] = os.environ['PATH'] + ":/test" -print("OS PATH var is set to: '"+os.environ['PATH']+"'\n") -print("Restoring original PATH value.") +print "OS PATH var is set to: '"+os.environ['PATH']+"'\n" +print "Restoring original PATH value." os.environ['PATH'] = path_env_var -print("OS PATH var is set to: '"+path_env_var+"'\n") +print "OS PATH var is set to: '"+path_env_var+"'\n" # Let's create the file test.out and write animals array to it... -print("\nWriting test.out file...") +print "\nWriting test.out file..." file = open("test.out", "w") for i in animals: file.write(i+"\n") file.close() # Now open the file we wrote and read it back... -print("\nContents of test.out file:") +print "\nContents of test.out file:" file = open("test.out", "r") linenum = 1 for line in file: - print("line "+str(linenum)+": "+line) + print "line "+str(linenum)+": "+line, linenum += 1 file.close() diff --git a/rust/Cargo.lock b/rust/Cargo.lock deleted file mode 100644 index f7d53cc..0000000 --- a/rust/Cargo.lock +++ /dev/null @@ -1,5 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "rust" -version = "0.1.0" diff --git a/rust/Cargo.toml b/rust/Cargo.toml deleted file mode 100644 index a8b9818..0000000 --- a/rust/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "rust" -version = "0.1.0" -authors = ["Ed Braaten "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/rust/src/main.rs b/rust/src/main.rs deleted file mode 100644 index f69047c..0000000 --- a/rust/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, rust world!"); -} diff --git a/misc-tools/sizeofchk/Makefile b/sizeofchk/Makefile similarity index 100% rename from misc-tools/sizeofchk/Makefile rename to sizeofchk/Makefile diff --git a/misc-tools/sizeofchk/README.md b/sizeofchk/README.md similarity index 100% rename from misc-tools/sizeofchk/README.md rename to sizeofchk/README.md diff --git a/misc-tools/sizeofchk/sizeofchk.c b/sizeofchk/sizeofchk.c similarity index 100% rename from misc-tools/sizeofchk/sizeofchk.c rename to sizeofchk/sizeofchk.c