Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DUP Pull #1

Open
wants to merge 130 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
1472f01
Update CMake files
ellamckenney Apr 11, 2024
db2d19c
Made changes to CMake
ellamckenney Apr 11, 2024
29b506a
Update for DUP
ellamckenney Apr 11, 2024
4079c28
Erin Code upload 4/11
erobertson7 Apr 11, 2024
d2f741f
Create README
erobertson7 Apr 11, 2024
a61ac2c
Delete FORTH_Stack_Operations/Erin-RFORTH-April-11 directory
erobertson7 Apr 11, 2024
1ff27ff
Adding files from my rforth repository of what I currently have done
nrojas-0 Apr 11, 2024
5419400
Added subdirectory
nrojas-0 Apr 11, 2024
7237685
Adding rforth files from Nancy's Repo
nrojas-0 Apr 11, 2024
fa90a1e
Update comments in code
ellamckenney Apr 11, 2024
b9f2deb
Minor updates to comments
ellamckenney Apr 11, 2024
333034f
Update README.md to reflect project goals
ellamckenney Apr 11, 2024
bd56016
Update personal README to show progress
ellamckenney Apr 11, 2024
b91ee9c
Update README with goals and report from last week
ellamckenney Apr 11, 2024
cb69957
Merge files for Erin
ellamckenney Apr 11, 2024
508042a
Update CMake file
ellamckenney Apr 11, 2024
e0c0c5d
Initial merge of existing code
ellamckenney Apr 11, 2024
68715ee
Delete FORTH_Stack_Operations directory
erobertson7 Apr 11, 2024
410f538
Added onto week one progress
nrojas-0 Apr 11, 2024
dc9abea
Updated Readme with progress from week 1
nrojas-0 Apr 11, 2024
696b8c9
Merge pull request #1 from nrojas-0/main
erobertson7 Apr 11, 2024
29d9054
Adding plans for the week to README
nrojas-0 Apr 11, 2024
6997b24
Merge pull request #2 from nrojas-0/main
nrojas-0 Apr 11, 2024
efd53c9
updated README
nrojas-0 Apr 11, 2024
e566d3f
Merge pull request #3 from nrojas-0/main
nrojas-0 Apr 11, 2024
55ab00d
Update new rforth .c and .h files to reflect merge.
ellamckenney Apr 13, 2024
bb02555
Update README for Week Two
ellamckenney Apr 13, 2024
2bbe71f
Update Documentation
ellamckenney Apr 13, 2024
2bebce1
Add Google Test folder
ellamckenney Apr 15, 2024
e5b44cd
Update CMake file
ellamckenney Apr 15, 2024
82cf182
Update googletest folder
ellamckenney Apr 15, 2024
ad33229
Add build files
ellamckenney Apr 15, 2024
ad91f2b
Made new subdirectory
nrojas-0 Apr 16, 2024
ff9a9d8
Added some files that might help with build?
nrojas-0 Apr 16, 2024
0e71e50
moved some files to the rforth subdirectory
nrojas-0 Apr 16, 2024
be796b8
Commented out other subdirectories and added new subdirectory
nrojas-0 Apr 16, 2024
a9cb92f
Added subdirectory
nrojas-0 Apr 16, 2024
dea828e
added ignore file
nrojas-0 Apr 16, 2024
2016c10
deleted googletest files
nrojas-0 Apr 16, 2024
e625bf7
deleted build files
nrojas-0 Apr 16, 2024
16c9305
commented out other subdirectories and only have rforth
nrojas-0 Apr 16, 2024
b692865
reorganized CMake for rforth
nrojas-0 Apr 16, 2024
ddbe643
Merge branch 'main' into main
nrojas-0 Apr 16, 2024
a56b938
Merge pull request #4 from nrojas-0/main
nrojas-0 Apr 16, 2024
f4ace36
Delete googletest directory
nrojas-0 Apr 16, 2024
4786521
deleted build
nrojas-0 Apr 16, 2024
bcc87bd
copied from Nancy's fork
nrojas-0 Apr 16, 2024
a5146ea
updated readme
nrojas-0 Apr 16, 2024
495bca7
pulling from repo to make changes
nrojas-0 Apr 16, 2024
98a8bd2
modifiying diverged branch
nrojas-0 Apr 16, 2024
73c853d
added build
nrojas-0 Apr 16, 2024
fc05c6f
Updated README
nrojas-0 Apr 16, 2024
b3bde72
renamed subdirectory and deleted build
nrojas-0 Apr 16, 2024
e263d04
update cmake
nrojas-0 Apr 16, 2024
4c06687
changed subdirectory name and updated other files to follow change
nrojas-0 Apr 16, 2024
b9b4c88
commented out subdirectory
nrojas-0 Apr 16, 2024
254b372
Update README.md with new plans for the week
ellamckenney Apr 16, 2024
74e59fe
Update Ella's plans for the week
ellamckenney Apr 16, 2024
fd9a183
Update README.md
ellamckenney Apr 18, 2024
fe26034
Remove duplicate main functions. Add int stack operator references.
ellamckenney Apr 18, 2024
e927002
Add int stack operator files.
ellamckenney Apr 18, 2024
9704c23
Remove duplicate evaluate functions
ellamckenney Apr 18, 2024
49526ba
Update CMakeLists file to reflect eariler changes
ellamckenney Apr 18, 2024
1adc594
Add googletest folder to rforth folder
ellamckenney Apr 18, 2024
029d811
More CMakeFile Updates
ellamckenney Apr 18, 2024
a3f5ec6
Changed the include file
nrojas-0 Apr 18, 2024
11ea281
Added new files to help with build and deleted some code from rforth_…
nrojas-0 Apr 18, 2024
846efdd
Add min/max functionality.
ellamckenney Apr 18, 2024
508cb11
Update README to reflect new functionality
ellamckenney Apr 18, 2024
f975788
Updated file names
nrojas-0 Apr 19, 2024
0959522
Updated README
nrojas-0 Apr 19, 2024
5e39d01
Add ABS/NEGATE functionality. Add basic Main function - update at a l…
ellamckenney Apr 19, 2024
83b6279
Add .h support for NEGATE functionality.
ellamckenney Apr 19, 2024
8aeed4c
Update README.md
ellamckenney Apr 19, 2024
5a53846
Add floor, ceil, pick, and pickn functions.
ellamckenney Apr 21, 2024
a56f85c
README Updates
ellamckenney Apr 21, 2024
576440d
README Updates
ellamckenney Apr 21, 2024
8a72b36
commented out main in int_stack_operators.c because it caused the bui…
nrojas-0 Apr 21, 2024
3391350
Added negate fucntion to be detected when negated is typed
nrojas-0 Apr 21, 2024
44059e6
Added pop to get rid of the original value and then only push the new…
nrojas-0 Apr 21, 2024
cca0916
Updating ReadME
nrojas-0 Apr 21, 2024
d528d4d
Updating README
nrojas-0 Apr 21, 2024
5c8b7f1
Updated README
nrojas-0 Apr 21, 2024
58ce6e6
Updating README.md
nrojas-0 Apr 21, 2024
d8cf400
Adding Tests file
nrojas-0 Apr 21, 2024
a78304a
adding depth function
nrojas-0 Apr 21, 2024
cdba550
setting up tests
nrojas-0 Apr 22, 2024
5bcdba0
Adding testing CMakeLists and Test file setup
nrojas-0 Apr 22, 2024
c568e61
working on Tests, pushing to save progress so far
nrojas-0 Apr 22, 2024
54afe62
Test for Depth Function
nrojas-0 Apr 22, 2024
4c7afef
Adding Test for negate
nrojas-0 Apr 22, 2024
aa57b27
added test for min
erobertson7 Apr 22, 2024
def0293
updated int_stack_operators.h with min function
erobertson7 Apr 22, 2024
63bd0ce
added test for max
erobertson7 Apr 22, 2024
649a1cf
updating for max test
erobertson7 Apr 22, 2024
5420b11
Update README.md
erobertson7 Apr 22, 2024
ba3426d
Working on how forth prints
nrojas-0 Apr 22, 2024
84fb3b2
merging changes from erin with some that i made to how forth prints
nrojas-0 Apr 22, 2024
aaf86a2
added header for test
nrojas-0 Apr 22, 2024
dc1c638
potential tests for floor and ceil
erobertson7 Apr 22, 2024
27fd2b2
included floor and ceil
erobertson7 Apr 22, 2024
0302ee1
Add repeat and loop functionality. Loop works for push.
ellamckenney Apr 23, 2024
063542d
Update README
ellamckenney Apr 23, 2024
bb989f5
adding min to be detected and execute function
nrojas-0 Apr 23, 2024
0bc1b5e
added new functions to be run
nrojas-0 Apr 23, 2024
4559a78
Added negative numbers to be identified as numbers
nrojas-0 Apr 23, 2024
9df7236
Commented out tests in order to debug issues
nrojas-0 Apr 23, 2024
b57c63e
commented out some things and made it so operations work with >=2
nrojas-0 Apr 23, 2024
d7d30a7
added abs to be identified and ran when abs is entered as input
nrojas-0 Apr 23, 2024
ba5d37c
added line to pop old negative number so it's replaced by abs_value
nrojas-0 Apr 23, 2024
f4d7c20
Added abs and seperated those who don't have tests fully working yet
nrojas-0 Apr 23, 2024
40f63fd
debugged issues with pickn
nrojas-0 Apr 23, 2024
946c7a2
added comment to explain the else if statement for pickn
nrojas-0 Apr 24, 2024
179fe92
Added pick method to be identified and executed when pick is typed
nrojas-0 Apr 24, 2024
8e9c85c
added pick to h file
nrojas-0 Apr 24, 2024
6d6858c
updated readme
nrojas-0 Apr 24, 2024
d2765f8
debugged min and max tests and added abs test. All three are function…
nrojas-0 Apr 24, 2024
ffa4e04
Updated README with debugging status/progress
nrojas-0 Apr 24, 2024
a9b80d4
updated readme syntax
nrojas-0 Apr 24, 2024
0694043
Updating README
ellamckenney Apr 25, 2024
f6c7617
Add recursion to min/max functions
ellamckenney Apr 25, 2024
9be52ff
Changed recursive method for min by making it go into a variable and …
nrojas-0 Apr 29, 2024
e23fa16
Added line for changing the prompt text color and added closing progr…
nrojas-0 Apr 30, 2024
54e0d47
Added comment about prompt color
nrojas-0 Apr 30, 2024
751c181
Added to be able to test 2 functions
nrojas-0 Apr 30, 2024
b1f7ce6
added words to be identified and how functions were run
nrojas-0 Apr 30, 2024
07e73e5
Added tests from previous programs from all of us and setting up to m…
nrojas-0 Apr 30, 2024
b396939
finished adding tests for functions and having certain ones show the …
nrojas-0 Apr 30, 2024
cf29df2
Changed from Tester to bye for the exit command
nrojas-0 Apr 30, 2024
dc15db0
changed ok? to ok as it's printed when the user hits enter or enters .
nrojas-0 Apr 30, 2024
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
Prev Previous commit
changed ok? to ok as it's printed when the user hits enter or enters .
  • Loading branch information
nrojas-0 committed Apr 30, 2024
commit dc15db0d6eda4a673f697db78639410037d841e1
2 changes: 1 addition & 1 deletion rforth/rforth_functions.c
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ void print_forth(int_stack_t *stk){
int i = 0;
int pos = 0;
if (stk->size == 0) { //if stack is empty then it's not printed and the message is only printed
printf(" ok?\n"); //I have the question mark to distinguish it in testing it to make more like forth
printf(" ok\n"); //I have the question mark to distinguish it in testing it to make more like forth
}

SLIST_FOREACH(entry, &stk->head, entries) {