Fix naming conventions and line ending issues (#43)

Author: chtenb

.editorconfig

@@ -13,7 +13,11 @@ tab_width = 4
 
 # New line preferences
 end_of_line = crlf
-insert_final_newline = false
+insert_final_newline = true
+
+# Other
+trim_trailing_whitespace = true
+charset = utf-8
 
 #### .NET Coding Conventions ####
 
@@ -167,7 +171,7 @@ dotnet_naming_rule.types_should_be_pascal_case.severity = warning
 dotnet_naming_rule.types_should_be_pascal_case.symbols = types
 dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
 
-dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = silent
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning
 dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
 dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
 
@@ -196,3 +200,12 @@ dotnet_naming_style.begins_with_i.required_prefix = I
 dotnet_naming_style.begins_with_i.required_suffix = 
 dotnet_naming_style.begins_with_i.word_separator = 
 dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+# internal and private fields should be _camelCase
+dotnet_naming_rule.camel_case_for_private_internal_fields.severity = warning
+dotnet_naming_rule.camel_case_for_private_internal_fields.symbols  = private_internal_fields
+dotnet_naming_rule.camel_case_for_private_internal_fields.style    = camel_case_underscore_style
+dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
+dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
+dotnet_naming_style.camel_case_underscore_style.required_prefix = _
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case 

.gitattributes

@@ -0,0 +1,13 @@
+# Don't do any line ending normalization, ever
+* -text
+
+# Improve diffing
+*.cs diff=csharp
+*.cpp diff=cpp
+*.hpp diff=cpp
+*.c diff=cpp
+*.h diff=cpp
+
+# Prevent git from interpreting dot as Microsoft Word documents while diffing.
+*.dot !diff
+*.DOT !diff

.github/workflows/main.yml

@@ -1,58 +1,64 @@
-# This is a basic workflow to help you get started with Actions
-
-name: CI
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the master branch
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-# https://timheuer.com/blog/building-net-framework-apps-using-github-actions/
-jobs:
-  # This workflow contains a single job called "build"
-  build:
-
-    runs-on: windows-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-    - uses: actions/checkout@v1
-      name: Checkout Code
-
-    - name: Add msbuild to PATH
-      uses: microsoft/[email protected]
-
-    - name: Setup NuGet.exe for use with actions
-      uses: NuGet/[email protected]
-
-    - name: Restore NuGet Packages
-      run: nuget restore Rubjerg.Graphviz.sln
-
-    - name: Build App
-      run: msbuild Rubjerg.Graphviz.sln /p:Configuration=Release
-
-    - name: Check if README is up-to-date
-      run: git diff --exit-code -- README.md
-
-    - name: Run Unittests With Coverage Calculation
-      run: packages\opencover\4.7.922\tools\OpenCover.Console.exe -returntargetcode -skipautoprops -register '-target:packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe' -targetargs:'Rubjerg.Graphviz.Test\bin\x64\Release\net48\Rubjerg.Graphviz.Test.dll --where \"cat!=Slow and cat!=Flaky\" '  '-filter:+[Rubjerg*]* -[Rubjerg.Graphviz.Test*]*'
-
-    - name: Upload Coverage data
-      run: |
-        echo "C:\msys64\usr\bin" >> $GITHUB_PATH
-        Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
-        bash codecov.sh -f "results.xml"
-
-    - name: Run Nuget Tests
-      run: packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe Rubjerg.Graphviz.NugetTest\bin\x64\Release\net48\Rubjerg.Graphviz.NugetTest.dll
-
-    - name: Run Transitive Tests
-      run: packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe Rubjerg.Graphviz.TransitiveTest\bin\x64\Release\net48\Rubjerg.Graphviz.TransitiveTest.dll
-
-    - name: Run Transitive Nuget Tests
-      run: packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe Rubjerg.Graphviz.TransitiveNugetTest\bin\x64\Release\net48\Rubjerg.Graphviz.TransitiveNugetTest.dll
-
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+# https://timheuer.com/blog/building-net-framework-apps-using-github-actions/
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+
+    runs-on: windows-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout Code
+
+    - name: Check if line endings are CRLF
+      run: |
+        bash -c "git grep -rlIP . | xargs unix2dos"
+        echo test
+        git diff --exit-code
+
+    - name: Add msbuild to PATH
+      uses: microsoft/[email protected]
+
+    - name: Setup NuGet.exe for use with actions
+      uses: NuGet/[email protected]
+
+    - name: Restore NuGet Packages
+      run: nuget restore Rubjerg.Graphviz.sln
+
+    - name: Build App
+      run: msbuild Rubjerg.Graphviz.sln /p:Configuration=Release
+
+    - name: Check if README is up-to-date
+      run: git diff --exit-code -- README.md
+
+    - name: Run Unittests With Coverage Calculation
+      run: packages\opencover\4.7.922\tools\OpenCover.Console.exe -returntargetcode -skipautoprops -register '-target:packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe' -targetargs:'Rubjerg.Graphviz.Test\bin\x64\Release\net48\Rubjerg.Graphviz.Test.dll --where \"cat!=Slow and cat!=Flaky\" '  '-filter:+[Rubjerg*]* -[Rubjerg.Graphviz.Test*]*'
+
+    - name: Upload Coverage data
+      run: |
+        echo "C:\msys64\usr\bin" >> $GITHUB_PATH
+        Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
+        bash codecov.sh -f "results.xml"
+
+    - name: Run Nuget Tests
+      run: packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe Rubjerg.Graphviz.NugetTest\bin\x64\Release\net48\Rubjerg.Graphviz.NugetTest.dll
+
+    - name: Run Transitive Tests
+      run: packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe Rubjerg.Graphviz.TransitiveTest\bin\x64\Release\net48\Rubjerg.Graphviz.TransitiveTest.dll
+
+    - name: Run Transitive Nuget Tests
+      run: packages\nunit.consolerunner\3.12.0\tools\nunit3-console.exe Rubjerg.Graphviz.TransitiveNugetTest\bin\x64\Release\net48\Rubjerg.Graphviz.TransitiveNugetTest.dll
+

.gitignore

@@ -1,6 +1,6 @@
-.vs
-packages/
-TestResult.xml
-results.xml
-*.nupkg
-NativeFiles/
+.vs
+packages/
+TestResult.xml
+results.xml
+*.nupkg
+NativeFiles/

GraphvizWrapper/.gitignore

@@ -1,2 +1,2 @@
-bin
-*.vcxproj.user
+bin
+*.vcxproj.user

GraphvizWrapper/Main.cpp

@@ -13,12 +13,12 @@ using namespace std;
 extern "C" {
 
 	// Some wrappers around existing cgraph functions to handle string marshaling
-    __declspec(dllexport) const char* imagmemwrite(Agraph_t * g);
-    __declspec(dllexport) Agraph_t* imagmemread(const char* s);
-    __declspec(dllexport) const char* imagget(void* obj, char* name);
-    __declspec(dllexport) const char* imagnameof(void* obj);
-    __declspec(dllexport) Agraph_t* imagopen(char* name, int graphtype);
-    __declspec(dllexport) const char *imsym_key(Agsym_t *sym);
+    __declspec(dllexport) const char* rj_agmemwrite(Agraph_t * g);
+    __declspec(dllexport) Agraph_t* rj_agmemread(const char* s);
+    __declspec(dllexport) const char* rj_agget(void* obj, char* name);
+    __declspec(dllexport) const char* rj_agnameof(void* obj);
+    __declspec(dllexport) Agraph_t* rj_agopen(char* name, int graphtype);
+    __declspec(dllexport) const char *rj_sym_key(Agsym_t *sym);
 
     __declspec(dllexport) double node_x(Agnode_t* node);
     __declspec(dllexport) double node_y(Agnode_t* node);
@@ -44,7 +44,7 @@ extern "C" {
     // Test and debug functions
     __declspec(dllexport) bool echobool(bool arg);
     __declspec(dllexport) int echoint(int arg);
-    __declspec(dllexport) void imdebug();
+    __declspec(dllexport) void rj_debug();
 }
 
 
@@ -57,30 +57,30 @@ char* marshalCString(const char* s)
     return ptr;
 }
 
-static int imafread(void* stream, char* buffer, int bufsize)
+static int rj_afread(void* stream, char* buffer, int bufsize)
 {
     istringstream* is = (istringstream*) stream;
     is->read(buffer, bufsize);
     int result = (int) is->gcount();
     return result;
 }
 
-static int imputstr(void* stream, const char *s)
+static int rj_putstr(void* stream, const char *s)
 {
     ostringstream* os = (ostringstream*) stream;
     (*os) << s;
     return 0;
 }
 
-static int imflush(void* stream)
+static int rj_flush(void* stream)
 {
     ostringstream* os = (ostringstream*) stream;
     os->flush();
     return 0;
 }
 
 
-static Agiodisc_t memIoDisc = {imafread, imputstr, imflush};
+static Agiodisc_t memIoDisc = {rj_afread, rj_putstr, rj_flush};
 static Agdisc_t memDisc = {0, 0, &memIoDisc};
 
 textlabel_t* node_label(Agnode_t* node) { return ND_label(node); }
@@ -102,9 +102,9 @@ double node_y(Agnode_t* node) { return ND_coord(node).y; } // in points
 double node_width(Agnode_t* node) { return ND_width(node); } // in inches
 double node_height(Agnode_t* node) { return ND_height(node); } // in inches
 
-const char *imsym_key(Agsym_t *sym) { return marshalCString(sym->name); }
+const char *rj_sym_key(Agsym_t *sym) { return marshalCString(sym->name); }
 
-Agraph_t* imagopen(char* name, int graphtype)
+Agraph_t* rj_agopen(char* name, int graphtype)
 {
     if (graphtype == 0)
         return agopen(name, Agdirected, &memDisc);
@@ -117,16 +117,16 @@ Agraph_t* imagopen(char* name, int graphtype)
 	return 0;
 }
 
-Agraph_t* imagmemread(const char* s)
+Agraph_t* rj_agmemread(const char* s)
 {
     stringstream stream;
     stream << s;
     Agraph_t* g = agread(&stream, &memDisc);
     return g;
 }
 
-// Note: for this function to work, the graph has to be created with the memDisc, e.g. using imagopen
-void imagwrite(Agraph_t * g, const char* filename)
+// Note: for this function to work, the graph has to be created with the memDisc, e.g. using rj_agopen
+void rj_agwrite(Agraph_t * g, const char* filename)
 {
     ostringstream os;
     agwrite(g, &os);
@@ -135,21 +135,21 @@ void imagwrite(Agraph_t * g, const char* filename)
     out.close();
 }
 
-// Note: for this function to work, the graph has to be created with the memDisc, e.g. using imagopen
-const char* imagmemwrite(Agraph_t * g)
+// Note: for this function to work, the graph has to be created with the memDisc, e.g. using rj_agopen
+const char* rj_agmemwrite(Agraph_t * g)
 {
     ostringstream os;
     agwrite(g, &os);
     return marshalCString(os.str().c_str());
 }
 
-const char* imagget(void* obj, char* name)
+const char* rj_agget(void* obj, char* name)
 {
     char* result = agget(obj, name);
     return marshalCString(result);
 }
 
-const char* imagnameof(void* obj)
+const char* rj_agnameof(void* obj)
 {
     char* result = agnameof(obj);
     return marshalCString(result);
@@ -188,11 +188,11 @@ int echoint(int arg)
     return arg;
 }
 
-void imdebug()
+void rj_debug()
 {
 }
 
 int main()
 {
-    imdebug();
+    rj_debug();
 }