rbx.cp 0.5.1__tar.gz → 0.5.3__tar.gz

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.1
+Version: 0.5.3
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.1"
+version = "0.5.3"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/rbx/box/main.py

@@ -363,6 +363,9 @@ def environment_command(
     if env is None:
         cfg = config.get_config()
         console.console.print(f'Current environment: [item]{cfg.boxEnvironment}[/item]')
+        console.console.print(
+            f'Location: {environment.get_environment_path(cfg.boxEnvironment)}'
+        )
         return
     if install_from is not None:
         environment.install_environment(env, pathlib.Path(install_from))

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/rbx/box/packaging/boca/extension.py

@@ -14,9 +14,9 @@ class BocaExtension(BaseModel):
 
     def flags_with_defaults(self) -> typing.Dict[BocaLanguage, str]:
         res: typing.Dict[BocaLanguage, str] = {
-            'c': '-std=gnu11 -O2 -static -lm',
-            'cpp': '-O2 -static -lm',
-            'cc': '-std=c++20 -O2 -static -lm',
+            'c': '-std=gnu11 -O2 -lm -static',
+            'cpp': '-O2 -lm -static',
+            'cc': '-std=c++20 -O2 -lm -static',
         }
         res.update(self.flags)
         return res

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/rbx/box/packaging/boca/packager.py

@@ -48,13 +48,13 @@ class BocaPackager(BasePackager):
 
     def _get_problem_name(self) -> str:
         pkg = package.find_problem_package_or_die()
-        return pkg.name
+        # BOCA forces Java class names to be the name of the problem.
+        return pkg.name.replace('-', '_')
 
     def _get_problem_info(self) -> str:
-        pkg = package.find_problem_package_or_die()
         statement = self._get_main_statement()
         return (
-            f'basename={pkg.name}\n'
+            f'basename={self._get_problem_name()}\n'
             f'fullname={statement.title}\n'
             f'descfile={self._get_problem_name()}.pdf\n'
         )
@@ -128,6 +128,8 @@ class BocaPackager(BasePackager):
         return compare_path.read_text()
 
     def _get_checker(self) -> str:
+        extension = get_extension_or_default('boca', BocaExtension)
+
         checker_path = get_default_app_path() / 'packagers' / 'boca' / 'checker.sh'
         if not checker_path.exists():
             console.console.print(
@@ -137,8 +139,10 @@ class BocaPackager(BasePackager):
         checker_text = checker_path.read_text()
         testlib = get_testlib().read_text()
         checker = package.get_checker().path.read_text()
-        return checker_text.replace('{{testlib_content}}', testlib).replace(
-            '{{checker_content}}', checker
+        return (
+            checker_text.replace('{{rbxFlags}}', extension.flags_with_defaults()['cc'])
+            .replace('{{testlib_content}}', testlib)
+            .replace('{{checker_content}}', checker)
         )
 
     def _get_compile(self, language: BocaLanguage) -> str:
@@ -165,6 +169,33 @@ class BocaPackager(BasePackager):
             compile_text = compile_text.replace('{{rbxFlags}}', flags[language])
         return compile_text
 
+    def _copy_solutions(self, into_path: pathlib.Path):
+        for solution in package.get_solutions():
+            dest_path = (
+                into_path
+                / solution.path.stem
+                / pathlib.Path(self._get_problem_name()).with_suffix(
+                    solution.path.suffix
+                )
+            )
+            dest_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copy(str(solution.path), dest_path)
+
+            if solution.path.suffix == '.java':
+                java_content = dest_path.read_text()
+                if (
+                    'class Main ' not in java_content
+                    and f'class {self._get_problem_name()} ' not in java_content
+                ):
+                    console.console.print(
+                        '[error]For BOCA packaging, Java solutions must be named `class Main` or `class <ProblemName>`.[/error]'
+                    )
+                dest_path.write_text(
+                    java_content.replace(
+                        'class Main ', f'class {self._get_problem_name()} '
+                    )
+                )
+
     def name(self) -> str:
         return 'boca'
 
@@ -223,6 +254,11 @@ class BocaPackager(BasePackager):
             (description_path / self._get_problem_name()).with_suffix('.pdf'),
         )
 
+        # Copy solutions
+        solutions_path = into_path / 'solutions'
+        solutions_path.mkdir(parents=True, exist_ok=True)
+        self._copy_solutions(solutions_path)
+
         # Prepare IO
         inputs_path = into_path / 'input'
         inputs_path.mkdir(parents=True, exist_ok=True)

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/rbx/box/stresses.py

@@ -1,4 +1,3 @@
-import dataclasses
 import functools
 import time
 from shutil import rmtree
@@ -175,11 +174,13 @@ def run_stress(
 
         @functools.cache
         def run_solution_and_checker_fn(
-            solution: str,
-            checker: Optional[finder_parser.FinderChecker],
+            call: finder_parser.FinderCall,
             input_path=input_path,
             expected_output_path=expected_output_path,
         ) -> finder_parser.FinderResult:
+            solution = call.solution
+            checker = call.checker
+
             solution_result = run_solution_fn(solution)
 
             if checker is None:
@@ -196,19 +197,11 @@ def run_stress(
                 solution=solution,
                 outcome=checker_result.outcome,
                 checker=checker,
-                truth_value=True,
                 solution_result=solution_result,
                 checker_result=checker_result,
             )
 
-        def run_fn(
-            call: finder_parser.FinderCall,
-        ) -> finder_parser.FinderResult:
-            finder_result = run_solution_and_checker_fn(call.solution, call.checker)
-            truth_value = call.expected_outcome.match(finder_result.outcome)
-            return dataclasses.replace(finder_result, truth_value=truth_value)
-
-        runner = finder_parser.FinderTreeRunner(runner=run_fn)
+        runner = finder_parser.FinderTreeRunner(runner=run_solution_and_checker_fn)
         finder_outcome: finder_parser.FinderOutcome = runner.transform(parsed_finder)
 
         internal_error_results = [

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/rbx/box/stressing/finder_parser.py

@@ -2,7 +2,7 @@ import dataclasses
 import pathlib
 import typing
 from enum import Enum
-from typing import Callable, List, Optional
+from typing import Callable, List, Optional, Union
 
 import lark
 import typer
@@ -20,23 +20,34 @@ disjunction: conjunction | disjunction _OR conjunction
 
 conjunction: _atom | conjunction _AND _atom
 
-_atom: statement | "(" disjunction ")" | negation
+_atom: logical | "(" disjunction ")" | negation
 negation: _NOT "(" disjunction ")"
 
-statement: solution matcher outcome checking?
+// Expressions
+logical: eval matcher expected_outcome -> matching
+       | eval equality (eval | outcome) -> equating
 
+eval: "[" solution checking? "]"
+
+// Eval
 solution: _filename | WILDCARD
-outcome: CNAME
 checking: "ON"i (checking_mode? checker | ":nil")
 checking_mode: MODE ":"
 MODE: "2" | "3"
 checker: _filename | WILDCARD
 
+// Outcomes
+expected_outcome: CNAME
+outcome: CNAME
+
 // Operators
 matcher: MATCHES | NOT_MATCHES
+equality: EQUALS | NOT_EQUALS
 
 MATCHES: "~"
 NOT_MATCHES: "!~"
+EQUALS: "=="
+NOT_EQUALS: "!="
 _OR: "||"
 _AND: "&&"
 _NOT: "!"
@@ -46,7 +57,14 @@ WILDCARD: "$"
 _filename: FILENAME | "\"" FILENAME "\""
 FILENAME: /[\/A-Za-z0-9\-_\.]/+
 
-%import common.CNAME
+// Names (Variables)
+LCASE_LETTER: "a".."z"
+UCASE_LETTER: "A".."Z"
+DIGIT: "0".."9"
+LETTER: UCASE_LETTER | LCASE_LETTER
+WORD: LETTER+
+CNAME: ("_"|LETTER) ("_"|LETTER|DIGIT|"+")*
+
 %ignore " "
 """
 
@@ -67,7 +85,6 @@ class FinderChecker:
 @dataclasses.dataclass(frozen=True)
 class FinderCall:
     solution: str
-    expected_outcome: ExpectedOutcome
     checker: Optional[FinderChecker]
 
 
@@ -83,7 +100,6 @@ class FinderResult:
     solution: str
     outcome: Outcome
     checker: Optional[FinderChecker]
-    truth_value: bool
 
     # Auxiliary information.
     solution_result: Optional[FinderSolutionResult] = None
@@ -155,8 +171,8 @@ def _get_checker_from_token(token: lark.Token) -> str:
     return path
 
 
-def _get_statement_checker(statement: lark.ParseTree) -> Optional[FinderChecker]:
-    checking_nodes = list(statement.find_data('checking'))
+def _get_eval_checker(eval: lark.ParseTree) -> Optional[FinderChecker]:
+    checking_nodes = list(eval.find_data('checking'))
     if not checking_nodes:
         return _get_default_checker_for_finder()
     (checking,) = checking_nodes
@@ -227,11 +243,11 @@ def get_all_solution_items(tree: lark.ParseTree) -> List[CodeItem]:
 
 
 def _get_all_finder_checkers(tree: lark.ParseTree) -> List[FinderChecker]:
-    statement_nodes = tree.find_data('statement')
+    eval_nodes = tree.find_data('eval')
     res = []
 
-    for statement_node in statement_nodes:
-        finder_checker = _get_statement_checker(statement_node)
+    for eval_node in eval_nodes:
+        finder_checker = _get_eval_checker(eval_node)
         if finder_checker is not None:
             res.append(finder_checker)
 
@@ -299,8 +315,6 @@ def validate(tree: lark.ParseTree):
 
 @lark.v_args(inline=True)
 class FinderTreeRunner(lark.Transformer):
-    outcome = ExpectedOutcome
-
     def __init__(
         self,
         runner: Callable[[FinderCall], FinderResult],
@@ -310,27 +324,72 @@ class FinderTreeRunner(lark.Transformer):
     def solution(self, token: lark.Token) -> str:
         return _get_solution_from_token(token)
 
+    def outcome(self, token: lark.Token) -> Outcome:
+        try:
+            outcome = Outcome(token.value)
+        except ValueError:
+            try:
+                expected_outcome = self.expected_outcome(token)
+            except ValueError:
+                raise ValueError(f'"{token.value}" is not a valid Outcome.') from None
+            outcomes = expected_outcome.get_matches()
+            if len(outcomes) != 1:
+                raise ValueError(
+                    f'"{token.value}" is not a valid Outcome. You are trying to specify an ExpectedOutcome, instead of a single Outcome.'
+                ) from None
+            return outcomes[0]
+        return outcome
+
+    def expected_outcome(self, token: lark.Token) -> ExpectedOutcome:
+        return ExpectedOutcome(token.value)
+
     def matcher(self, op: lark.Token) -> bool:
         return op.value == '~'
 
+    def equality(self, op: lark.Token) -> bool:
+        return op.value == '=='
+
     @lark.v_args(inline=False, tree=True)
-    def statement(
+    def eval(self, tree: lark.ParseTree) -> FinderResult:
+        solution = typing.cast(str, tree.children[0])
+        checker: Optional[FinderChecker] = _get_eval_checker(tree)
+
+        call = FinderCall(solution, checker=checker)
+        return self.run_fn(call)
+
+    def matching(
         self,
-        tree: lark.ParseTree,
+        eval_result: FinderResult,
+        is_positive: bool,
+        expected_outcome: ExpectedOutcome,
     ) -> FinderOutcome:
-        solution = typing.cast(str, tree.children[0])
-        is_positive = typing.cast(bool, tree.children[1])
-        expected_outcome = typing.cast(ExpectedOutcome, tree.children[2])
+        truth_value = expected_outcome.match(eval_result.outcome)
+        if not is_positive:
+            truth_value = not truth_value
+
+        return FinderOutcome(truth_value=truth_value, results=[eval_result])
+
+    def equating(
+        self,
+        eval_result: FinderResult,
+        is_positive: bool,
+        result_or_outcome: Union[FinderResult, Outcome],
+    ) -> FinderOutcome:
+        results = [eval_result]
+        truth_value = True
 
-        checker: Optional[FinderChecker] = _get_statement_checker(tree)
+        if isinstance(result_or_outcome, Outcome):
+            outcome: Outcome = result_or_outcome
+            truth_value = eval_result.outcome == outcome
+        else:
+            result: FinderResult = result_or_outcome
+            truth_value = eval_result.outcome == result.outcome
+            results.append(result)
 
-        call = FinderCall(solution, expected_outcome=expected_outcome, checker=checker)
-        result = self.run_fn(call)
-        truth_value = result.truth_value
         if not is_positive:
             truth_value = not truth_value
 
-        return FinderOutcome(truth_value=truth_value, results=[result])
+        return FinderOutcome(truth_value=truth_value, results=results)
 
     def negation(self, value: FinderOutcome) -> FinderOutcome:
         return dataclasses.replace(value, truth_value=not value.truth_value)

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/rbx/resources/packagers/boca/checker.sh

@@ -29,7 +29,7 @@ if [ -f "$checker_cache" ]; then
     cp "$checker_cache" $CHECKER_OUT -f
 else
     echo "Compiling polygon checker: $CHECKER_PATH"
-    $cc {{stdcpp}} -static -O2 -lm $CHECKER_PATH -o $CHECKER_OUT
+    $cc {{rbxFlags}} $CHECKER_PATH -o $CHECKER_OUT
     
     if [ $? -ne 0 ]; then
         echo "Checker could not be compiled"
@@ -40,4 +40,4 @@ else
 fi
 
 chmod 0755 $CHECKER_OUT
-### END OF CHECKER COMPILATION
+### END OF CHECKER COMPILATION

{rbx_cp-0.5.1 → rbx_cp-0.5.3}/rbx/resources/presets/default/problem/problem.rbx.yml

@@ -38,7 +38,7 @@ stresses:
     generator:
       name: 'gen'
       args: '[1..<MAX_N>] @' # `@` generates a random string
-    finder: 'sols/wa.cpp ~ INCORRECT'
+    finder: '[sols/wa.cpp] ~ INCORRECT'
 vars:
   "MAX_N": 1000000000  # Can be used in the validator, in stress tests and in the statement.