From 1c7c0a0fd6860c51dea173e2bcb1fd259f87733a Mon Sep 17 00:00:00 2001 From: Arity-T Date: Mon, 9 Dec 2024 14:43:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=D0=B8?= =?UTF-8?q?=D1=86=D0=B0=20=D0=B8=20show?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- coursework/part2/app/Main.hs | 7 ++++++- coursework/part2/package.yaml | 1 + coursework/part2/part2.cabal | 3 +++ coursework/part2/stack.yaml | 4 +++- coursework/part2/stack.yaml.lock | 9 ++++++++- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/coursework/part2/app/Main.hs b/coursework/part2/app/Main.hs index c2958dc..b4d2753 100644 --- a/coursework/part2/app/Main.hs +++ b/coursework/part2/app/Main.hs @@ -1,6 +1,11 @@ module Main (main) where import Lib +import UnescapingPrint (uprint) main :: IO () -main = putStrLn "Temp" +main = + putStrLn "Введите имя файла:" >> + getLine >>= \fileName -> + readFile fileName >>= \content -> + uprint $ splitText content diff --git a/coursework/part2/package.yaml b/coursework/part2/package.yaml index 8f0abe5..6d3b318 100644 --- a/coursework/part2/package.yaml +++ b/coursework/part2/package.yaml @@ -21,6 +21,7 @@ description: Please see the README on GitHub at = 4.7 && < 5 +- unescaping-print ghc-options: - -Wall diff --git a/coursework/part2/part2.cabal b/coursework/part2/part2.cabal index 21366bb..741652a 100644 --- a/coursework/part2/part2.cabal +++ b/coursework/part2/part2.cabal @@ -35,6 +35,7 @@ library ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints build-depends: base >=4.7 && <5 + , unescaping-print default-language: Haskell2010 executable part2-exe @@ -49,6 +50,7 @@ executable part2-exe build-depends: base >=4.7 && <5 , part2 + , unescaping-print default-language: Haskell2010 test-suite part2-test @@ -64,4 +66,5 @@ test-suite part2-test build-depends: base >=4.7 && <5 , part2 + , unescaping-print default-language: Haskell2010 diff --git a/coursework/part2/stack.yaml b/coursework/part2/stack.yaml index d8656a4..2e5527a 100644 --- a/coursework/part2/stack.yaml +++ b/coursework/part2/stack.yaml @@ -40,7 +40,9 @@ packages: # - git: https://github.com/commercialhaskell/stack.git # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a # -# extra-deps: [] +extra-deps: + - unescaping-print-0.1@sha256:12774feb474d20ac3041d577b6307730c7376127f59bc79612d599a56d5009d8,1397 +allow-newer: true # Override default flag values for project packages and extra-deps # flags: {} diff --git a/coursework/part2/stack.yaml.lock b/coursework/part2/stack.yaml.lock index e542442..f3120b2 100644 --- a/coursework/part2/stack.yaml.lock +++ b/coursework/part2/stack.yaml.lock @@ -3,7 +3,14 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: [] +packages: +- completed: + hackage: unescaping-print-0.1@sha256:12774feb474d20ac3041d577b6307730c7376127f59bc79612d599a56d5009d8,1397 + pantry-tree: + sha256: b32edaf8cdef31ef02a0363e629ddf4949a6490777a6a797617f5dd376a46fce + size: 371 + original: + hackage: unescaping-print-0.1@sha256:12774feb474d20ac3041d577b6307730c7376127f59bc79612d599a56d5009d8,1397 snapshots: - completed: sha256: 08bd13ce621b41a8f5e51456b38d5b46d7783ce114a50ab604d6bbab0d002146