fix everything

This commit is contained in:
vel 2024-11-12 16:23:41 -08:00
parent e5b1dd03b5
commit 9ed9e72ad2
Signed by: velvox
GPG Key ID: 59D9762F674151DF
9 changed files with 48 additions and 45 deletions

View File

@ -8,7 +8,7 @@ extern char *yytext;
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
FILE *file; FILE *file;
const char *filename = "samples/quadratic_snippet.cbl"; // Default filename const char *filename = "samples/quadratic-snippet.cbl";
// Check if a filename is provided as a command-line argument // Check if a filename is provided as a command-line argument
if (argc > 1) { if (argc > 1) {

View File

@ -20,7 +20,7 @@ struct token_st {
UTEST(scanner, hello) { UTEST(scanner, hello) {
struct token_st tokens[] = { struct token_st tokens[] = {
{TOKEN_IDENTIFICATION, "IDENTIFICATION"}, {TOKEN_KEYWORD_IDENTIFICATION, "IDENTIFICATION"},
{TOKEN_KEYWORD_DIVISION, "DIVISION"}, {TOKEN_KEYWORD_DIVISION, "DIVISION"},
{TOKEN_DOT, "."}, {TOKEN_DOT, "."},
{TOKEN_PROGRAM_ID, "PROGRAM-ID"}, {TOKEN_PROGRAM_ID, "PROGRAM-ID"},
@ -56,7 +56,7 @@ UTEST(scanner, quadratic) {
{TOKEN_COMMENT, "*> Code altered from https://www.quora.com/What-is-a-COBOL-program-that-will-solve-a-quadratic-equation"}, {TOKEN_COMMENT, "*> Code altered from https://www.quora.com/What-is-a-COBOL-program-that-will-solve-a-quadratic-equation"},
{TOKEN_COMMENT, "*> Program finds the roots to a simple quadratic equation"}, {TOKEN_COMMENT, "*> Program finds the roots to a simple quadratic equation"},
{TOKEN_IDENTIFICATION, "IDENTIFICATION"}, {TOKEN_KEYWORD_IDENTIFICATION, "IDENTIFICATION"},
{TOKEN_KEYWORD_DIVISION, "DIVISION"}, {TOKEN_KEYWORD_DIVISION, "DIVISION"},
{TOKEN_DOT, "."}, {TOKEN_DOT, "."},
{TOKEN_PROGRAM_ID, "PROGRAM-ID"}, {TOKEN_PROGRAM_ID, "PROGRAM-ID"},
@ -316,7 +316,7 @@ UTEST(scanner, quadratic) {
UTEST(scanner, sorting) { UTEST(scanner, sorting) {
struct token_st tokens[] = { struct token_st tokens[] = {
{TOKEN_IDENTIFICATION, "IDENTIFICATION"}, {TOKEN_KEYWORD_IDENTIFICATION, "IDENTIFICATION"},
{TOKEN_KEYWORD_DIVISION, "DIVISION"}, {TOKEN_KEYWORD_DIVISION, "DIVISION"},
{TOKEN_DOT, "."}, {TOKEN_DOT, "."},
{TOKEN_PROGRAM_ID, "PROGRAM-ID"}, {TOKEN_PROGRAM_ID, "PROGRAM-ID"},

View File

@ -14,22 +14,21 @@
77 square-root-discriminant PIC S9(5)V9(5) COMP-3. 77 square-root-discriminant PIC S9(5)V9(5) COMP-3.
PROCEDURE DIVISION. *> program begins here PROCEDURE DIVISION. *> program begins here
DISPLAY 'EQUATION: (1x^2) + 5x + 6 = 0' DISPLAY "EQUATION: (1x^2) + 5x + 6 = 0"
COMPUTE discriminant = (b ** 2) - (4 * a * c) COMPUTE discriminant = (b ** 2) - (4 * a * c)
IF discriminant > 0 IF discriminant > 0
COMPUTE square-root-discriminant = FUNCTION SQRT(discriminant) COMPUTE square-root-discriminant = FUNCTION SQRT(discriminant)
COMPUTE root1 = (-b + square-root-discriminant) / (2 * a) COMPUTE root1 = (-b + square-root-discriminant) / (2 * a)
COMPUTE root2 = (-b - square-root-discriminant) / (2 * a) COMPUTE root2 = (-b - square-root-discriminant) / (2 * a)
DISPLAY 'The equation has two distinct real roots: ' DISPLAY "The equation has two distinct real roots: "
DISPLAY 'Root 1: ' root1 DISPLAY "Root 1: " root1
DISPLAY 'Root 2: ' root2 DISPLAY "Root 2: " root2
ELSE IF discriminant = 0 ELSE IF discriminant = 0
COMPUTE root1 = -b / (2 * a) COMPUTE root1 = -b / (2 * a)
DISPLAY 'The equation has one real root: ' DISPLAY "The equation has one real root: "
DISPLAY 'Root: ' root1 DISPLAY "Root: " root1
ELSE ELSE
DISPLAY 'The equation has no real roots.' DISPLAY "The equation has no real roots."
END-IF
STOP RUN. STOP RUN.

BIN
lab-3/scanner Executable file

Binary file not shown.

View File

@ -6,8 +6,8 @@ DIGIT [0-9]+
%% %%
(" "|\t|\n) /* skip whitespace */ (" "|\t|\n) /* skip whitespace */
\*>\ ?.* { return TOKEN_COMMENT; } \*>\ ?.*
IDENTIFICATION { return TOKEN_IDENTIFICATION; } IDENTIFICATION { return TOKEN_KEYWORD_IDENTIFICATION; }
DIVISION { return TOKEN_KEYWORD_DIVISION; } DIVISION { return TOKEN_KEYWORD_DIVISION; }
PROGRAM-ID { return TOKEN_PROGRAM_ID; } PROGRAM-ID { return TOKEN_PROGRAM_ID; }
PROCEDURE { return TOKEN_PROCEDURE; } PROCEDURE { return TOKEN_PROCEDURE; }
@ -27,7 +27,6 @@ PERFORM { return TOKEN_PERFORM; }
END-PERFORM { return TOKEN_END_PERFORM; } END-PERFORM { return TOKEN_END_PERFORM; }
IF { return TOKEN_IF; } IF { return TOKEN_IF; }
END-IF { return TOKEN_END_IF; } END-IF { return TOKEN_END_IF; }
ELSE { return TOKEN_ELSE; }
SPACE { return TOKEN_SPACE; } SPACE { return TOKEN_SPACE; }
PIC { return TOKEN_PICTURE; } PIC { return TOKEN_PICTURE; }
OCCURS { return TOKEN_KEYWORD_OCCURS; } OCCURS { return TOKEN_KEYWORD_OCCURS; }
@ -43,7 +42,6 @@ COMP-1 { return TOKEN_COMPUTATION_LEVEL_1; }
COMP-2 { return TOKEN_COMPUTATION_LEVEL_2; } COMP-2 { return TOKEN_COMPUTATION_LEVEL_2; }
COMP-3 { return TOKEN_COMPUTATION_LEVEL_3; } COMP-3 { return TOKEN_COMPUTATION_LEVEL_3; }
{DIGIT} { return TOKEN_INTEGER; } {DIGIT} { return TOKEN_INTEGER; }
{NAME} { return TOKEN_IDENT; } {NAME} { return TOKEN_IDENT; }
\+ { return TOKEN_ADD; } \+ { return TOKEN_ADD; }
@ -55,7 +53,6 @@ COMP-3 { return TOKEN_COMPUTATION_LEVEL_3; }
\< { return TOKEN_LESS_THAN; } \< { return TOKEN_LESS_THAN; }
\= { return TOKEN_EQUAL;} \= { return TOKEN_EQUAL;}
"\""[^"]*"\"" { return TOKEN_STRING; } "\""[^"]*"\"" { return TOKEN_STRING; }
"\'"[^']*"\'" { return TOKEN_STRING; } "\'"[^']*"\'" { return TOKEN_STRING; }
"(" { return TOKEN_LEFT_PARENTHESIS; } "(" { return TOKEN_LEFT_PARENTHESIS; }

View File

@ -1,6 +1,6 @@
typedef enum { typedef enum {
TOKEN_EOF = 0, TOKEN_EOF = 0,
TOKEN_IDENTIFICATION, TOKEN_KEYWORD_IDENTIFICATION,
TOKEN_KEYWORD_DIVISION, TOKEN_KEYWORD_DIVISION,
TOKEN_KEYWORD_DATA, TOKEN_KEYWORD_DATA,
TOKEN_KEYWORD_SECTION, TOKEN_KEYWORD_SECTION,

View File

@ -93,43 +93,53 @@ simple_stmt : cbl_func_stmt
cbl_func_stmt : cbl_function cbl_func_stmt : cbl_function
| cbl_function op_parms | cbl_function op_parms
| cbl_function assignment_stmt | cbl_function assignment_stmt
| cbl_function op_parms assignment_stmt | cbl_function op_parm assignment_stmt
; ;
assignment_stmt : TOKEN_EQUAL ext_function assignment_stmt : TOKEN_EQUAL ext_function
| TOKEN_EQUAL function | TOKEN_EQUAL op_parms
| TOKEN_KEYWORD_TO op_parms | TOKEN_KEYWORD_TO op_parms
; ;
op_parms : op_parms TOKEN_ADD op_parms op_parms : op_parm
| op_parms TOKEN_SUB op_parms | op_parms op_parm
| op_parms TOKEN_MULTIPLY op_parms
| op_parms TOKEN_DIVIDE op_parms
| op_parms TOKEN_EXPONENTIAL op_parms
| op_parms TOKEN_LESS_THAN op_parms
| op_parms TOKEN_GREATER_THAN op_parms
| op_parms TOKEN_EQUAL op_parms
| TOKEN_SUB op_parms
| TOKEN_LEFT_PARENTHESIS op_parms TOKEN_RIGHT_PARENTHESIS
| expr
| op_parms op_parms
; ;
expr : TOKEN_IDENT op_parm : mathmaticalexpr
| booleanexpr
| type_expr
;
mathmaticalexpr : type_expr
| mathmaticalexpr TOKEN_ADD mathmaticalexpr
| mathmaticalexpr TOKEN_SUB mathmaticalexpr
| mathmaticalexpr TOKEN_MULTIPLY mathmaticalexpr
| mathmaticalexpr TOKEN_DIVIDE mathmaticalexpr
| mathmaticalexpr TOKEN_EXPONENTIAL mathmaticalexpr
| container_expr
| type_expr container_expr
;
container_expr : TOKEN_LEFT_PARENTHESIS op_parms TOKEN_RIGHT_PARENTHESIS
;
booleanexpr : mathmaticalexpr TOKEN_LESS_THAN mathmaticalexpr
| mathmaticalexpr TOKEN_GREATER_THAN mathmaticalexpr
| mathmaticalexpr TOKEN_EQUAL mathmaticalexpr
;
type_expr : TOKEN_IDENT
| TOKEN_INTEGER | TOKEN_INTEGER
| TOKEN_STRING | TOKEN_STRING
| TOKEN_SPACE | TOKEN_SPACE
; | TOKEN_SUB TOKEN_IDENT
function : op_parms
; ;
ext_function : TOKEN_KEYWORD_FUNCTION TOKEN_IDENT TOKEN_LEFT_PARENTHESIS TOKEN_IDENT TOKEN_RIGHT_PARENTHESIS ext_function : TOKEN_KEYWORD_FUNCTION TOKEN_IDENT TOKEN_LEFT_PARENTHESIS TOKEN_IDENT TOKEN_RIGHT_PARENTHESIS
; ;
cbl_function : TOKEN_DISPLAY cbl_function : TOKEN_DISPLAY
| TOKEN_MOVE | TOKEN_MOVE
| TOKEN_KEYWORD_COMPUTE | TOKEN_KEYWORD_COMPUTE
| TOKEN_PERFORM
; ;
if_branch : TOKEN_IF op_parms if_branch : if_start statements else_parts
| TOKEN_ELSE_IF op_parms ;
| TOKEN_ELSE statement if_start : TOKEN_IF booleanexpr
| TOKEN_END_IF ;
else_parts :
| TOKEN_ELSE_IF booleanexpr statements else_parts
| TOKEN_ELSE statements
; ;
perform_stmt : TOKEN_PERFORM TOKEN_VARYING TOKEN_IDENT TOKEN_KEYWORD_FROM TOKEN_INTEGER TOKEN_KEYWORD_BY TOKEN_INTEGER TOKEN_UNTIL op_parms perform_stmt : TOKEN_PERFORM TOKEN_VARYING TOKEN_IDENT TOKEN_KEYWORD_FROM TOKEN_INTEGER TOKEN_KEYWORD_BY TOKEN_INTEGER TOKEN_UNTIL op_parms
| TOKEN_END_PERFORM | TOKEN_END_PERFORM

View File

@ -24,12 +24,10 @@
DISPLAY "The equation has two distinct real roots: " DISPLAY "The equation has two distinct real roots: "
DISPLAY "Root 1: " root1 DISPLAY "Root 1: " root1
DISPLAY "Root 2: " root2 DISPLAY "Root 2: " root2
ELSE IF discriminant = 0 ELSE IF discriminant = 0
COMPUTE root1 = -b / (2 * a) COMPUTE root1 = -b / (2 * a)
DISPLAY "The equation has one real root: " DISPLAY "The equation has one real root: "
DISPLAY "Root: " root1 DISPLAY "Root: " root1
ELSE ELSE
DISPLAY "The equation has no real roots." DISPLAY "The equation has no real roots."
STOP RUN. STOP RUN.

View File

@ -39,7 +39,6 @@ PROCEDURE DIVISION.
MOVE WS-SORT-ROW(WS-J) TO WS-TEMP-ROW MOVE WS-SORT-ROW(WS-J) TO WS-TEMP-ROW
MOVE WS-SORT-ROW(WS-J + 1) TO WS-SORT-ROW(WS-J) MOVE WS-SORT-ROW(WS-J + 1) TO WS-SORT-ROW(WS-J)
MOVE WS-TEMP-ROW TO WS-SORT-ROW(WS-J + 1) MOVE WS-TEMP-ROW TO WS-SORT-ROW(WS-J + 1)
END-IF
END-PERFORM END-PERFORM
END-PERFORM END-PERFORM