Fix bugs

wviana · Sep 17, 2020 · 92372e2 · 92372e2
1 parent 282e5d1
commit 92372e2
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/lib/rpn_stack.dart b/lib/rpn_stack.dart
@@ -6,8 +6,15 @@ class RpnStack {
     stack.add(EditableItem.blank());
   }
   RpnStack.clone(RpnStack source) {
-    // XXX need to deep copy items
-    stack.addAll(source.stack);
+    for (final o in source.stack) {
+      StackItem clone;
+      if (o is EditableItem) {
+        clone = EditableItem(o);
+      } else if (o is RealizedItem) {
+        clone = RealizedItem(o.value);
+      }
+      stack.add(clone);
+    }
     appendNew = source.appendNew;
   }
   final List<StackItem> stack = [];
@@ -45,8 +52,9 @@ class RpnStack {
   }
 
   void advance() {
+    final current = stack.first;
     _realizeStack();
-    push(EditableItem(stack[0]));
+    push(EditableItem(current));
   }
 
   void swap() {

diff --git a/lib/stack_item_widget.dart b/lib/stack_item_widget.dart
@@ -50,15 +50,17 @@ class StackItemWidget extends StatelessWidget {
             switch (value) {
               case 'copy':
                 Clipboard.setData(ClipboardData(text: item.toString())).then(
-                    // XXX get snackbar to match theme colors
-                    (_) => Scaffold.of(context).showSnackBar(const SnackBar(
-                          content: Text('Copied to clipboard'),
-                          duration: Duration(seconds: 1),
-                        )));
+                  (_) => Scaffold.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text('Copied to clipboard'),
+                      duration: Duration(seconds: 2),
+                    ),
+                  ),
+                );
                 break;
               case 'paste':
-                num newVal;
                 Clipboard.getData('text/plain').then((value) {
+                  num newVal;
                   final s = value.text;
                   try {
                     if (s.contains('.')) {
@@ -67,10 +69,13 @@ class StackItemWidget extends StatelessWidget {
                       newVal = int.parse(s);
                     }
                   } on FormatException catch (_) {
-                    Scaffold.of(context).showSnackBar(const SnackBar(
-                      content: Text('Clipboard is not a valid number'),
-                      duration: Duration(seconds: 1),
-                    ));
+                    Scaffold.of(context).showSnackBar(
+                      SnackBar(
+                        content: const Text('Clipboard is not a valid number'),
+                        backgroundColor: Theme.of(context).errorColor,
+                        duration: const Duration(seconds: 3),
+                      ),
+                    );
                     return 0;
                   }
                   onPaste(newVal);

diff --git a/test/rpn_stack_test.dart b/test/rpn_stack_test.dart
@@ -10,6 +10,11 @@ void main() {
       expect(s.isEmpty, true);
     });
 
+    test('advancing when empty has no result', () {
+      final s = RpnStack()..advance();
+      expect(s.isEmpty, true);
+    });
+
     test('characters are appended', () {
       final s = RpnStack()
         ..appendCurrent('2')