From 81ff90ccd8c1ef8853791919a18f15cdea556f92 Mon Sep 17 00:00:00 2001 From: Charles Iliya Krempeaux Date: Tue, 28 Nov 2023 08:07:35 -0800 Subject: [PATCH] initial commits --- readcr.go | 7 +++++-- readcr_test.go | 38 +++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/readcr.go b/readcr.go index f3c5907..555bc36 100644 --- a/readcr.go +++ b/readcr.go @@ -2,9 +2,12 @@ package eol import ( "io" + + "sourcecode.social/reiver/go-opt" ) func ReadCR(runescanner io.RuneScanner) (size int, err error) { - const runeNumber = 1 - return readthisrune(runescanner, cr, runeNumber) + const characterNumber uint64 = 1 + var circumstance internalCircumstance = specifyCircumstance(opt.Something(CR), characterNumber) + return readthisrune(circumstance, runescanner, cr) } diff --git a/readcr_test.go b/readcr_test.go index 61667c7..c45a08b 100644 --- a/readcr_test.go +++ b/readcr_test.go @@ -67,103 +67,103 @@ func TestReadCR_fail(t *testing.T) { }{ { Value: "", - ExpectedError: `eol: problem reading character №1 of end-of-line sequence: EOF`, + ExpectedError: `eol: problem reading character №1 of end-of-line sequence "\r": EOF`, }, { Value: "\n", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '\n' (U+000A)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '\n' (U+000A)`, }, { Value: "\u0085", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '\u0085' (U+0085)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '\u0085' (U+0085)`, }, { Value: "\u2028", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '\u2028' (U+2028)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '\u2028' (U+2028)`, }, { Value: "😈", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '😈' (U+1F608)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '😈' (U+1F608)`, }, { Value: "\napple banana cherry", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '\n' (U+000A)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '\n' (U+000A)`, }, { Value: "\u0085apple banana cherry", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '\u0085' (U+0085)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '\u0085' (U+0085)`, }, { Value: "\u2028apple banana cherry", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '\u2028' (U+2028)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '\u2028' (U+2028)`, }, { Value: "😈apple banana cherry", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '😈' (U+1F608)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '😈' (U+1F608)`, }, { Value: " \n", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found ' ' (U+0020)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found ' ' (U+0020)`, }, { Value: " \r", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found ' ' (U+0020)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found ' ' (U+0020)`, }, { Value: " \u0085", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found ' ' (U+0020)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found ' ' (U+0020)`, }, { Value: " \u2028", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found ' ' (U+0020)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found ' ' (U+0020)`, }, { Value: " 😈", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found ' ' (U+0020)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found ' ' (U+0020)`, }, { Value: ".\n", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '.' (U+002E)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '.' (U+002E)`, }, { Value: ".\r", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '.' (U+002E)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '.' (U+002E)`, }, { Value: ".\u0085", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '.' (U+002E)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '.' (U+002E)`, }, { Value: ".\u2028", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '.' (U+002E)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '.' (U+002E)`, }, { Value: ".😈", - ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line character №1 — instead found '.' (U+002E)`, + ExpectedError: `eol: carriage-return (CR) character ('\r') (U+000D) not found for end-of-line sequence "\r" character №1 — instead found '.' (U+002E)`, }, }