Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
67bfd7d
Начал работу
palorel Oct 17, 2022
f618c8e
Начал работу
palorel Oct 17, 2022
02ec316
Delete HomeworksAccept directory
Palezehvat Oct 17, 2022
b701e01
Delete ModulesAndFiles/sortAndFilesAndModules/sortAndFilesAndModules …
Palezehvat Oct 17, 2022
e28b6e2
Delete queue directory
Palezehvat Oct 17, 2022
1495402
Delete stack directory
Palezehvat Oct 17, 2022
7afad16
Добавил стек, написанный на предыдушем занятии
palorel Oct 17, 2022
2cd646d
Merge branch 'postfixCalculator' of https://github.com/Palezehvat/git…
palorel Oct 17, 2022
d3cb32f
Сохранил изменения, теперь точно добавил
palorel Oct 17, 2022
520737a
Компилятор ругался на разыменование пустого указателя, исправил
palorel Oct 17, 2022
53bdfef
Почти сделал функцию приема чисел и действий над ними от пользователя
palorel Oct 17, 2022
5df6e8b
Сделал функции сложения, умножения, вычитания, деления, исправляю ошибки
palorel Oct 17, 2022
8fc9efc
Доделал функцию приема строки и нашёл ошибки, связанные с передачей у…
palorel Oct 18, 2022
6c8752f
Добавил тесты изменил стартовое значение errorCode на 0
palorel Oct 18, 2022
8db96d8
Оптимизация
palorel Dec 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion HomeworksAccept/homework21.09/read.me

This file was deleted.

1 change: 0 additions & 1 deletion HomeworksAccept/homework28.09/read.me

This file was deleted.

1 change: 0 additions & 1 deletion HomeworksAccept/read.me

This file was deleted.

31 changes: 31 additions & 0 deletions postfixCalculator/postfixCalculator.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "postfixCalculator", "postfixCalculator\postfixCalculator.vcxproj", "{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Debug|x64.ActiveCfg = Debug|x64
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Debug|x64.Build.0 = Debug|x64
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Debug|x86.ActiveCfg = Debug|Win32
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Debug|x86.Build.0 = Debug|Win32
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Release|x64.ActiveCfg = Release|x64
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Release|x64.Build.0 = Release|x64
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Release|x86.ActiveCfg = Release|Win32
{8C7F0589-31A5-4678-A9C7-6C64BC73BE70}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0E76BB72-D754-45D2-AB98-9D4A536995AF}
EndGlobalSection
EndGlobal
103 changes: 103 additions & 0 deletions postfixCalculator/postfixCalculator/main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#include <stdio.h>
#include "stack.h"
#include <locale.h>
#include <string.h>
#include <stdbool.h>

int calculate(const char stringOfActions[], int* errorCode) {
size_t sizeString = strlen(stringOfActions);
size_t i = 0;
ElementStack* buffer = NULL;
while (i < sizeString) {
if (stringOfActions[i] >= '0' && stringOfActions[i] <= '9') {
int multiplier = 10;
int number = 0;
while (stringOfActions[i] >= '0' && stringOfActions[i] <= '9') {
number += stringOfActions[i] - '0';
number *= multiplier;
++i;
}
number /= 10;
--i;
pushElements(&buffer, number);
} else if (stringOfActions[i] != ' ') {
int numberAfter = 0;

int firstNumber = popElements(&buffer, errorCode);
if (*errorCode == 1) {
return 0;
}
int secondNumber = popElements(&buffer, errorCode);
if (*errorCode == 1) {
return 0;
}

switch (stringOfActions[i]) {
case '*':
numberAfter = firstNumber * secondNumber;
break;
case '+':
numberAfter = firstNumber + secondNumber;
break;
case '-':
numberAfter = secondNumber - firstNumber;
break;
case '/':
numberAfter = secondNumber / firstNumber;
break;
}

if (*errorCode == 1) {
clear(&buffer);
return 0;
}

pushElements(&buffer, numberAfter);
}
++i;
}

int result = popElements(&buffer, errorCode);
if (*errorCode == 1) {
return 0;
}

if (buffer != NULL) {
printf("�� ������ ����� �������� � �����\n");
return 0;
}

return result;
}

bool firstTest(void) {
const char *testString = "1 2 +";
int errorCode = 0;
return calculate(testString, &errorCode) == 3 && errorCode == 0;
}

bool secondTest(void) {
const char *testString = "1 2 + 4 3 * *";
int errorCode = 0;
return calculate(testString, &errorCode) == 36 && errorCode == 0;
}

int main() {
setlocale(LC_ALL, "RUS");
if (!firstTest() || !secondTest()) {
printf("���-�� ����� �� ���...\n");
return -1;
} else {
printf("����� ������� ��������!\n");
}
char stringOfActions[101] = {'\0'};
printf("������� ������������������ ���� � �������������� ��������, ������ �� ������ ��������� 100 ��������\n");
gets_s(stringOfActions, 100);
int errorCode = 0;
int result = calculate(stringOfActions, &errorCode);
if (errorCode == 1) {
printf("������...\n");
} else {
printf("%s %d\n", "���������:", result);
}
}
151 changes: 151 additions & 0 deletions postfixCalculator/postfixCalculator/postfixCalculator.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{8c7f0589-31a5-4678-a9c7-6c64bc73be70}</ProjectGuid>
<RootNamespace>postfixCalculator</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="main.c" />
<ClCompile Include="stack.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="stack.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Исходные файлы">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Файлы заголовков">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Файлы ресурсов">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.c">
<Filter>Исходные файлы</Filter>
</ClCompile>
<ClCompile Include="stack.c">
<Filter>Исходные файлы</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stack.h">
<Filter>Исходные файлы</Filter>
</ClInclude>
</ItemGroup>
</Project>
43 changes: 43 additions & 0 deletions postfixCalculator/postfixCalculator/stack.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#include "stack.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>

int pushElements(ElementStack** head, int value) {
ElementStack* temp = malloc(sizeof(ElementStack));
if (temp == NULL) {
return -1;
}
temp->value = value;
temp->next = *head;

*head = temp;
return 0;
}

bool isEmpty(ElementStack* head) {
return head == NULL;
}

void clear(ElementStack** head) {
while (!isEmpty(*head)) {
popElements(head, NULL);
}
}

int popElements(ElementStack** head, int* errorCode) {
if (*head == NULL) {
if (errorCode != NULL) {
*errorCode = 1;
}
return -1;
}

int value = (*head)->value;

ElementStack* temp = (*head)->next;
free(*head);
*head = temp;

return value;
}
17 changes: 17 additions & 0 deletions postfixCalculator/postfixCalculator/stack.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#ifndef STACK_H_
#define STACK_H_

#include <stdbool.h>

typedef struct ElementStack {
struct ElementStack* next;
int value;
} ElementStack;

int pushElements(ElementStack** head, int value);
bool isEmpty(ElementStack* head);
void clear(ElementStack** head);
int popElements(ElementStack** head, int* errorCode);

#endif // !STACK_H_